Moved net to core
diff --git a/net/api/pom.xml b/core/api/pom.xml
similarity index 95%
rename from net/api/pom.xml
rename to core/api/pom.xml
index d542a97..3fd8a01 100644
--- a/net/api/pom.xml
+++ b/core/api/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.onlab.onos</groupId>
- <artifactId>onos-net</artifactId>
+ <artifactId>onos-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/net/api/src/main/java/org/onlab/onos/GreetService.java b/core/api/src/main/java/org/onlab/onos/GreetService.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/GreetService.java
rename to core/api/src/main/java/org/onlab/onos/GreetService.java
diff --git a/net/api/src/main/java/org/onlab/onos/event/AbstractEvent.java b/core/api/src/main/java/org/onlab/onos/event/AbstractEvent.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/event/AbstractEvent.java
rename to core/api/src/main/java/org/onlab/onos/event/AbstractEvent.java
diff --git a/net/api/src/main/java/org/onlab/onos/event/AbstractListenerRegistry.java b/core/api/src/main/java/org/onlab/onos/event/AbstractListenerRegistry.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/event/AbstractListenerRegistry.java
rename to core/api/src/main/java/org/onlab/onos/event/AbstractListenerRegistry.java
diff --git a/net/api/src/main/java/org/onlab/onos/event/DefaultEventSinkRegistry.java b/core/api/src/main/java/org/onlab/onos/event/DefaultEventSinkRegistry.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/event/DefaultEventSinkRegistry.java
rename to core/api/src/main/java/org/onlab/onos/event/DefaultEventSinkRegistry.java
diff --git a/net/api/src/main/java/org/onlab/onos/event/Event.java b/core/api/src/main/java/org/onlab/onos/event/Event.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/event/Event.java
rename to core/api/src/main/java/org/onlab/onos/event/Event.java
diff --git a/net/api/src/main/java/org/onlab/onos/event/EventDeliveryService.java b/core/api/src/main/java/org/onlab/onos/event/EventDeliveryService.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/event/EventDeliveryService.java
rename to core/api/src/main/java/org/onlab/onos/event/EventDeliveryService.java
diff --git a/net/api/src/main/java/org/onlab/onos/event/EventDispatcher.java b/core/api/src/main/java/org/onlab/onos/event/EventDispatcher.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/event/EventDispatcher.java
rename to core/api/src/main/java/org/onlab/onos/event/EventDispatcher.java
diff --git a/net/api/src/main/java/org/onlab/onos/event/EventListener.java b/core/api/src/main/java/org/onlab/onos/event/EventListener.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/event/EventListener.java
rename to core/api/src/main/java/org/onlab/onos/event/EventListener.java
diff --git a/net/api/src/main/java/org/onlab/onos/event/EventSink.java b/core/api/src/main/java/org/onlab/onos/event/EventSink.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/event/EventSink.java
rename to core/api/src/main/java/org/onlab/onos/event/EventSink.java
diff --git a/net/api/src/main/java/org/onlab/onos/event/EventSinkRegistry.java b/core/api/src/main/java/org/onlab/onos/event/EventSinkRegistry.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/event/EventSinkRegistry.java
rename to core/api/src/main/java/org/onlab/onos/event/EventSinkRegistry.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/AbstractElement.java b/core/api/src/main/java/org/onlab/onos/net/AbstractElement.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/AbstractElement.java
rename to core/api/src/main/java/org/onlab/onos/net/AbstractElement.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/AbstractModel.java b/core/api/src/main/java/org/onlab/onos/net/AbstractModel.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/AbstractModel.java
rename to core/api/src/main/java/org/onlab/onos/net/AbstractModel.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/ConnectPoint.java b/core/api/src/main/java/org/onlab/onos/net/ConnectPoint.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/ConnectPoint.java
rename to core/api/src/main/java/org/onlab/onos/net/ConnectPoint.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/DefaultDevice.java b/core/api/src/main/java/org/onlab/onos/net/DefaultDevice.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/DefaultDevice.java
rename to core/api/src/main/java/org/onlab/onos/net/DefaultDevice.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/DefaultEdgeLink.java b/core/api/src/main/java/org/onlab/onos/net/DefaultEdgeLink.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/DefaultEdgeLink.java
rename to core/api/src/main/java/org/onlab/onos/net/DefaultEdgeLink.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/DefaultLink.java b/core/api/src/main/java/org/onlab/onos/net/DefaultLink.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/DefaultLink.java
rename to core/api/src/main/java/org/onlab/onos/net/DefaultLink.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/DefaultPort.java b/core/api/src/main/java/org/onlab/onos/net/DefaultPort.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/DefaultPort.java
rename to core/api/src/main/java/org/onlab/onos/net/DefaultPort.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/Description.java b/core/api/src/main/java/org/onlab/onos/net/Description.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/Description.java
rename to core/api/src/main/java/org/onlab/onos/net/Description.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/Device.java b/core/api/src/main/java/org/onlab/onos/net/Device.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/Device.java
rename to core/api/src/main/java/org/onlab/onos/net/Device.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/DeviceId.java b/core/api/src/main/java/org/onlab/onos/net/DeviceId.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/DeviceId.java
rename to core/api/src/main/java/org/onlab/onos/net/DeviceId.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/EdgeLink.java b/core/api/src/main/java/org/onlab/onos/net/EdgeLink.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/EdgeLink.java
rename to core/api/src/main/java/org/onlab/onos/net/EdgeLink.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/Element.java b/core/api/src/main/java/org/onlab/onos/net/Element.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/Element.java
rename to core/api/src/main/java/org/onlab/onos/net/Element.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/ElementId.java b/core/api/src/main/java/org/onlab/onos/net/ElementId.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/ElementId.java
rename to core/api/src/main/java/org/onlab/onos/net/ElementId.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/Host.java b/core/api/src/main/java/org/onlab/onos/net/Host.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/Host.java
rename to core/api/src/main/java/org/onlab/onos/net/Host.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/HostId.java b/core/api/src/main/java/org/onlab/onos/net/HostId.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/HostId.java
rename to core/api/src/main/java/org/onlab/onos/net/HostId.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/HostLocation.java b/core/api/src/main/java/org/onlab/onos/net/HostLocation.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/HostLocation.java
rename to core/api/src/main/java/org/onlab/onos/net/HostLocation.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/Link.java b/core/api/src/main/java/org/onlab/onos/net/Link.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/Link.java
rename to core/api/src/main/java/org/onlab/onos/net/Link.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/MastershipRole.java b/core/api/src/main/java/org/onlab/onos/net/MastershipRole.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/MastershipRole.java
rename to core/api/src/main/java/org/onlab/onos/net/MastershipRole.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/Path.java b/core/api/src/main/java/org/onlab/onos/net/Path.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/Path.java
rename to core/api/src/main/java/org/onlab/onos/net/Path.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/Port.java b/core/api/src/main/java/org/onlab/onos/net/Port.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/Port.java
rename to core/api/src/main/java/org/onlab/onos/net/Port.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/PortNumber.java b/core/api/src/main/java/org/onlab/onos/net/PortNumber.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/PortNumber.java
rename to core/api/src/main/java/org/onlab/onos/net/PortNumber.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/Provided.java b/core/api/src/main/java/org/onlab/onos/net/Provided.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/Provided.java
rename to core/api/src/main/java/org/onlab/onos/net/Provided.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/device/DefaultDeviceDescription.java b/core/api/src/main/java/org/onlab/onos/net/device/DefaultDeviceDescription.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/device/DefaultDeviceDescription.java
rename to core/api/src/main/java/org/onlab/onos/net/device/DefaultDeviceDescription.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/device/DefaultPortDescription.java b/core/api/src/main/java/org/onlab/onos/net/device/DefaultPortDescription.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/device/DefaultPortDescription.java
rename to core/api/src/main/java/org/onlab/onos/net/device/DefaultPortDescription.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/device/DeviceAdminService.java b/core/api/src/main/java/org/onlab/onos/net/device/DeviceAdminService.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/device/DeviceAdminService.java
rename to core/api/src/main/java/org/onlab/onos/net/device/DeviceAdminService.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/device/DeviceDescription.java b/core/api/src/main/java/org/onlab/onos/net/device/DeviceDescription.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/device/DeviceDescription.java
rename to core/api/src/main/java/org/onlab/onos/net/device/DeviceDescription.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/device/DeviceEvent.java b/core/api/src/main/java/org/onlab/onos/net/device/DeviceEvent.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/device/DeviceEvent.java
rename to core/api/src/main/java/org/onlab/onos/net/device/DeviceEvent.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/device/DeviceListener.java b/core/api/src/main/java/org/onlab/onos/net/device/DeviceListener.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/device/DeviceListener.java
rename to core/api/src/main/java/org/onlab/onos/net/device/DeviceListener.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/device/DeviceProvider.java b/core/api/src/main/java/org/onlab/onos/net/device/DeviceProvider.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/device/DeviceProvider.java
rename to core/api/src/main/java/org/onlab/onos/net/device/DeviceProvider.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/device/DeviceProviderRegistry.java b/core/api/src/main/java/org/onlab/onos/net/device/DeviceProviderRegistry.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/device/DeviceProviderRegistry.java
rename to core/api/src/main/java/org/onlab/onos/net/device/DeviceProviderRegistry.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/device/DeviceProviderService.java b/core/api/src/main/java/org/onlab/onos/net/device/DeviceProviderService.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/device/DeviceProviderService.java
rename to core/api/src/main/java/org/onlab/onos/net/device/DeviceProviderService.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/device/DeviceService.java b/core/api/src/main/java/org/onlab/onos/net/device/DeviceService.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/device/DeviceService.java
rename to core/api/src/main/java/org/onlab/onos/net/device/DeviceService.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/device/PortDescription.java b/core/api/src/main/java/org/onlab/onos/net/device/PortDescription.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/device/PortDescription.java
rename to core/api/src/main/java/org/onlab/onos/net/device/PortDescription.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/flow/FlowDescription.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowDescription.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/flow/FlowDescription.java
rename to core/api/src/main/java/org/onlab/onos/net/flow/FlowDescription.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProvider.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProvider.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProvider.java
rename to core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProvider.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderRegistry.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderRegistry.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderRegistry.java
rename to core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderRegistry.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java
rename to core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/host/HostDescription.java b/core/api/src/main/java/org/onlab/onos/net/host/HostDescription.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/host/HostDescription.java
rename to core/api/src/main/java/org/onlab/onos/net/host/HostDescription.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/host/HostEvent.java b/core/api/src/main/java/org/onlab/onos/net/host/HostEvent.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/host/HostEvent.java
rename to core/api/src/main/java/org/onlab/onos/net/host/HostEvent.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/host/HostListener.java b/core/api/src/main/java/org/onlab/onos/net/host/HostListener.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/host/HostListener.java
rename to core/api/src/main/java/org/onlab/onos/net/host/HostListener.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/host/HostProvider.java b/core/api/src/main/java/org/onlab/onos/net/host/HostProvider.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/host/HostProvider.java
rename to core/api/src/main/java/org/onlab/onos/net/host/HostProvider.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/host/HostProviderRegistry.java b/core/api/src/main/java/org/onlab/onos/net/host/HostProviderRegistry.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/host/HostProviderRegistry.java
rename to core/api/src/main/java/org/onlab/onos/net/host/HostProviderRegistry.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/host/HostProviderService.java b/core/api/src/main/java/org/onlab/onos/net/host/HostProviderService.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/host/HostProviderService.java
rename to core/api/src/main/java/org/onlab/onos/net/host/HostProviderService.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/host/HostService.java b/core/api/src/main/java/org/onlab/onos/net/host/HostService.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/host/HostService.java
rename to core/api/src/main/java/org/onlab/onos/net/host/HostService.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/link/DefaultLinkDescription.java b/core/api/src/main/java/org/onlab/onos/net/link/DefaultLinkDescription.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/link/DefaultLinkDescription.java
rename to core/api/src/main/java/org/onlab/onos/net/link/DefaultLinkDescription.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/link/LinkAdminService.java b/core/api/src/main/java/org/onlab/onos/net/link/LinkAdminService.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/link/LinkAdminService.java
rename to core/api/src/main/java/org/onlab/onos/net/link/LinkAdminService.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/link/LinkDescription.java b/core/api/src/main/java/org/onlab/onos/net/link/LinkDescription.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/link/LinkDescription.java
rename to core/api/src/main/java/org/onlab/onos/net/link/LinkDescription.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/link/LinkEvent.java b/core/api/src/main/java/org/onlab/onos/net/link/LinkEvent.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/link/LinkEvent.java
rename to core/api/src/main/java/org/onlab/onos/net/link/LinkEvent.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/link/LinkListener.java b/core/api/src/main/java/org/onlab/onos/net/link/LinkListener.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/link/LinkListener.java
rename to core/api/src/main/java/org/onlab/onos/net/link/LinkListener.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/link/LinkProvider.java b/core/api/src/main/java/org/onlab/onos/net/link/LinkProvider.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/link/LinkProvider.java
rename to core/api/src/main/java/org/onlab/onos/net/link/LinkProvider.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/link/LinkProviderRegistry.java b/core/api/src/main/java/org/onlab/onos/net/link/LinkProviderRegistry.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/link/LinkProviderRegistry.java
rename to core/api/src/main/java/org/onlab/onos/net/link/LinkProviderRegistry.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/link/LinkProviderService.java b/core/api/src/main/java/org/onlab/onos/net/link/LinkProviderService.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/link/LinkProviderService.java
rename to core/api/src/main/java/org/onlab/onos/net/link/LinkProviderService.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/link/LinkService.java b/core/api/src/main/java/org/onlab/onos/net/link/LinkService.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/link/LinkService.java
rename to core/api/src/main/java/org/onlab/onos/net/link/LinkService.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/provider/AbstractProvider.java b/core/api/src/main/java/org/onlab/onos/net/provider/AbstractProvider.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/provider/AbstractProvider.java
rename to core/api/src/main/java/org/onlab/onos/net/provider/AbstractProvider.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderRegistry.java b/core/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderRegistry.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderRegistry.java
rename to core/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderRegistry.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderService.java b/core/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderService.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderService.java
rename to core/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderService.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/provider/Provider.java b/core/api/src/main/java/org/onlab/onos/net/provider/Provider.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/provider/Provider.java
rename to core/api/src/main/java/org/onlab/onos/net/provider/Provider.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/provider/ProviderId.java b/core/api/src/main/java/org/onlab/onos/net/provider/ProviderId.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/provider/ProviderId.java
rename to core/api/src/main/java/org/onlab/onos/net/provider/ProviderId.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/provider/ProviderRegistry.java b/core/api/src/main/java/org/onlab/onos/net/provider/ProviderRegistry.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/provider/ProviderRegistry.java
rename to core/api/src/main/java/org/onlab/onos/net/provider/ProviderRegistry.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/provider/ProviderService.java b/core/api/src/main/java/org/onlab/onos/net/provider/ProviderService.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/provider/ProviderService.java
rename to core/api/src/main/java/org/onlab/onos/net/provider/ProviderService.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/topology/ClusterId.java b/core/api/src/main/java/org/onlab/onos/net/topology/ClusterId.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/topology/ClusterId.java
rename to core/api/src/main/java/org/onlab/onos/net/topology/ClusterId.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/topology/DefaultTopologyCluster.java b/core/api/src/main/java/org/onlab/onos/net/topology/DefaultTopologyCluster.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/topology/DefaultTopologyCluster.java
rename to core/api/src/main/java/org/onlab/onos/net/topology/DefaultTopologyCluster.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/topology/LinkWeight.java b/core/api/src/main/java/org/onlab/onos/net/topology/LinkWeight.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/topology/LinkWeight.java
rename to core/api/src/main/java/org/onlab/onos/net/topology/LinkWeight.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/topology/TopoEdge.java b/core/api/src/main/java/org/onlab/onos/net/topology/TopoEdge.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/topology/TopoEdge.java
rename to core/api/src/main/java/org/onlab/onos/net/topology/TopoEdge.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/topology/TopoVertex.java b/core/api/src/main/java/org/onlab/onos/net/topology/TopoVertex.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/topology/TopoVertex.java
rename to core/api/src/main/java/org/onlab/onos/net/topology/TopoVertex.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/topology/Topology.java b/core/api/src/main/java/org/onlab/onos/net/topology/Topology.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/topology/Topology.java
rename to core/api/src/main/java/org/onlab/onos/net/topology/Topology.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/topology/TopologyCluster.java b/core/api/src/main/java/org/onlab/onos/net/topology/TopologyCluster.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/topology/TopologyCluster.java
rename to core/api/src/main/java/org/onlab/onos/net/topology/TopologyCluster.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/topology/TopologyDescription.java b/core/api/src/main/java/org/onlab/onos/net/topology/TopologyDescription.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/topology/TopologyDescription.java
rename to core/api/src/main/java/org/onlab/onos/net/topology/TopologyDescription.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/topology/TopologyEvent.java b/core/api/src/main/java/org/onlab/onos/net/topology/TopologyEvent.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/topology/TopologyEvent.java
rename to core/api/src/main/java/org/onlab/onos/net/topology/TopologyEvent.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/topology/TopologyListener.java b/core/api/src/main/java/org/onlab/onos/net/topology/TopologyListener.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/topology/TopologyListener.java
rename to core/api/src/main/java/org/onlab/onos/net/topology/TopologyListener.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/topology/TopologyProvider.java b/core/api/src/main/java/org/onlab/onos/net/topology/TopologyProvider.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/topology/TopologyProvider.java
rename to core/api/src/main/java/org/onlab/onos/net/topology/TopologyProvider.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderRegistry.java b/core/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderRegistry.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderRegistry.java
rename to core/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderRegistry.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderService.java b/core/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderService.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderService.java
rename to core/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderService.java
diff --git a/net/api/src/main/java/org/onlab/onos/net/topology/TopologyService.java b/core/api/src/main/java/org/onlab/onos/net/topology/TopologyService.java
similarity index 100%
rename from net/api/src/main/java/org/onlab/onos/net/topology/TopologyService.java
rename to core/api/src/main/java/org/onlab/onos/net/topology/TopologyService.java
diff --git a/net/api/src/main/javadoc/org/onlab/onos/event/package.html b/core/api/src/main/javadoc/org/onlab/onos/event/package.html
similarity index 100%
rename from net/api/src/main/javadoc/org/onlab/onos/event/package.html
rename to core/api/src/main/javadoc/org/onlab/onos/event/package.html
diff --git a/net/api/src/main/javadoc/org/onlab/onos/net/device/package.html b/core/api/src/main/javadoc/org/onlab/onos/net/device/package.html
similarity index 100%
rename from net/api/src/main/javadoc/org/onlab/onos/net/device/package.html
rename to core/api/src/main/javadoc/org/onlab/onos/net/device/package.html
diff --git a/net/api/src/main/javadoc/org/onlab/onos/net/flow/package.html b/core/api/src/main/javadoc/org/onlab/onos/net/flow/package.html
similarity index 100%
rename from net/api/src/main/javadoc/org/onlab/onos/net/flow/package.html
rename to core/api/src/main/javadoc/org/onlab/onos/net/flow/package.html
diff --git a/net/api/src/main/javadoc/org/onlab/onos/net/host/package.html b/core/api/src/main/javadoc/org/onlab/onos/net/host/package.html
similarity index 100%
rename from net/api/src/main/javadoc/org/onlab/onos/net/host/package.html
rename to core/api/src/main/javadoc/org/onlab/onos/net/host/package.html
diff --git a/net/api/src/main/javadoc/org/onlab/onos/net/link/package.html b/core/api/src/main/javadoc/org/onlab/onos/net/link/package.html
similarity index 100%
rename from net/api/src/main/javadoc/org/onlab/onos/net/link/package.html
rename to core/api/src/main/javadoc/org/onlab/onos/net/link/package.html
diff --git a/net/api/src/main/javadoc/org/onlab/onos/net/package.html b/core/api/src/main/javadoc/org/onlab/onos/net/package.html
similarity index 100%
rename from net/api/src/main/javadoc/org/onlab/onos/net/package.html
rename to core/api/src/main/javadoc/org/onlab/onos/net/package.html
diff --git a/net/api/src/main/javadoc/org/onlab/onos/net/provider/package.html b/core/api/src/main/javadoc/org/onlab/onos/net/provider/package.html
similarity index 100%
rename from net/api/src/main/javadoc/org/onlab/onos/net/provider/package.html
rename to core/api/src/main/javadoc/org/onlab/onos/net/provider/package.html
diff --git a/net/api/src/main/javadoc/org/onlab/onos/net/topology/package.html b/core/api/src/main/javadoc/org/onlab/onos/net/topology/package.html
similarity index 100%
rename from net/api/src/main/javadoc/org/onlab/onos/net/topology/package.html
rename to core/api/src/main/javadoc/org/onlab/onos/net/topology/package.html
diff --git a/net/api/src/main/javadoc/org/onlab/onos/package.html b/core/api/src/main/javadoc/org/onlab/onos/package.html
similarity index 100%
rename from net/api/src/main/javadoc/org/onlab/onos/package.html
rename to core/api/src/main/javadoc/org/onlab/onos/package.html
diff --git a/net/api/src/test/java/org/onlab/onos/event/AbstractEventTest.java b/core/api/src/test/java/org/onlab/onos/event/AbstractEventTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/event/AbstractEventTest.java
rename to core/api/src/test/java/org/onlab/onos/event/AbstractEventTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/event/AbstractListenerRegistryTest.java b/core/api/src/test/java/org/onlab/onos/event/AbstractListenerRegistryTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/event/AbstractListenerRegistryTest.java
rename to core/api/src/test/java/org/onlab/onos/event/AbstractListenerRegistryTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/event/BrokenListener.java b/core/api/src/test/java/org/onlab/onos/event/BrokenListener.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/event/BrokenListener.java
rename to core/api/src/test/java/org/onlab/onos/event/BrokenListener.java
diff --git a/net/api/src/test/java/org/onlab/onos/event/DefaultEventSinkRegistryTest.java b/core/api/src/test/java/org/onlab/onos/event/DefaultEventSinkRegistryTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/event/DefaultEventSinkRegistryTest.java
rename to core/api/src/test/java/org/onlab/onos/event/DefaultEventSinkRegistryTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/event/TestEvent.java b/core/api/src/test/java/org/onlab/onos/event/TestEvent.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/event/TestEvent.java
rename to core/api/src/test/java/org/onlab/onos/event/TestEvent.java
diff --git a/net/api/src/test/java/org/onlab/onos/event/TestListener.java b/core/api/src/test/java/org/onlab/onos/event/TestListener.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/event/TestListener.java
rename to core/api/src/test/java/org/onlab/onos/event/TestListener.java
diff --git a/net/api/src/test/java/org/onlab/onos/event/TestListenerRegistry.java b/core/api/src/test/java/org/onlab/onos/event/TestListenerRegistry.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/event/TestListenerRegistry.java
rename to core/api/src/test/java/org/onlab/onos/event/TestListenerRegistry.java
diff --git a/net/api/src/test/java/org/onlab/onos/net/DefaultDeviceTest.java b/core/api/src/test/java/org/onlab/onos/net/DefaultDeviceTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/net/DefaultDeviceTest.java
rename to core/api/src/test/java/org/onlab/onos/net/DefaultDeviceTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/net/DefaultEdgeLinkTest.java b/core/api/src/test/java/org/onlab/onos/net/DefaultEdgeLinkTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/net/DefaultEdgeLinkTest.java
rename to core/api/src/test/java/org/onlab/onos/net/DefaultEdgeLinkTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/net/DefaultLinkTest.java b/core/api/src/test/java/org/onlab/onos/net/DefaultLinkTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/net/DefaultLinkTest.java
rename to core/api/src/test/java/org/onlab/onos/net/DefaultLinkTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/net/DefaultPortTest.java b/core/api/src/test/java/org/onlab/onos/net/DefaultPortTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/net/DefaultPortTest.java
rename to core/api/src/test/java/org/onlab/onos/net/DefaultPortTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/net/DeviceIdTest.java b/core/api/src/test/java/org/onlab/onos/net/DeviceIdTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/net/DeviceIdTest.java
rename to core/api/src/test/java/org/onlab/onos/net/DeviceIdTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/net/ElementIdTest.java b/core/api/src/test/java/org/onlab/onos/net/ElementIdTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/net/ElementIdTest.java
rename to core/api/src/test/java/org/onlab/onos/net/ElementIdTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/net/HostIdTest.java b/core/api/src/test/java/org/onlab/onos/net/HostIdTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/net/HostIdTest.java
rename to core/api/src/test/java/org/onlab/onos/net/HostIdTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/net/PortNumberTest.java b/core/api/src/test/java/org/onlab/onos/net/PortNumberTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/net/PortNumberTest.java
rename to core/api/src/test/java/org/onlab/onos/net/PortNumberTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/net/device/DefaultDeviceDescriptionTest.java b/core/api/src/test/java/org/onlab/onos/net/device/DefaultDeviceDescriptionTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/net/device/DefaultDeviceDescriptionTest.java
rename to core/api/src/test/java/org/onlab/onos/net/device/DefaultDeviceDescriptionTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/net/device/DeviceEventTest.java b/core/api/src/test/java/org/onlab/onos/net/device/DeviceEventTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/net/device/DeviceEventTest.java
rename to core/api/src/test/java/org/onlab/onos/net/device/DeviceEventTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/net/link/DefaultLinkDescriptionTest.java b/core/api/src/test/java/org/onlab/onos/net/link/DefaultLinkDescriptionTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/net/link/DefaultLinkDescriptionTest.java
rename to core/api/src/test/java/org/onlab/onos/net/link/DefaultLinkDescriptionTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/net/link/LinkEventTest.java b/core/api/src/test/java/org/onlab/onos/net/link/LinkEventTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/net/link/LinkEventTest.java
rename to core/api/src/test/java/org/onlab/onos/net/link/LinkEventTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/net/provider/AbstractProviderRegistryTest.java b/core/api/src/test/java/org/onlab/onos/net/provider/AbstractProviderRegistryTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/net/provider/AbstractProviderRegistryTest.java
rename to core/api/src/test/java/org/onlab/onos/net/provider/AbstractProviderRegistryTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/net/provider/AbstractProviderTest.java b/core/api/src/test/java/org/onlab/onos/net/provider/AbstractProviderTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/net/provider/AbstractProviderTest.java
rename to core/api/src/test/java/org/onlab/onos/net/provider/AbstractProviderTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/net/provider/ProviderIdTest.java b/core/api/src/test/java/org/onlab/onos/net/provider/ProviderIdTest.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/net/provider/ProviderIdTest.java
rename to core/api/src/test/java/org/onlab/onos/net/provider/ProviderIdTest.java
diff --git a/net/api/src/test/java/org/onlab/onos/net/provider/TestProvider.java b/core/api/src/test/java/org/onlab/onos/net/provider/TestProvider.java
similarity index 100%
rename from net/api/src/test/java/org/onlab/onos/net/provider/TestProvider.java
rename to core/api/src/test/java/org/onlab/onos/net/provider/TestProvider.java
diff --git a/net/pom.xml b/core/pom.xml
similarity index 93%
rename from net/pom.xml
rename to core/pom.xml
index fa146d9..13deec4 100644
--- a/net/pom.xml
+++ b/core/pom.xml
@@ -11,14 +11,14 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>onos-net</artifactId>
+ <artifactId>onos-core</artifactId>
<packaging>pom</packaging>
<description>ONOS Core root project</description>
<modules>
<module>api</module>
- <module>core</module>
+ <module>trivial</module>
</modules>
<dependencies>
diff --git a/net/core/pom.xml b/core/trivial/pom.xml
similarity index 73%
rename from net/core/pom.xml
rename to core/trivial/pom.xml
index 0ceaa17..1806ba4 100644
--- a/net/core/pom.xml
+++ b/core/trivial/pom.xml
@@ -6,19 +6,15 @@
<parent>
<groupId>org.onlab.onos</groupId>
- <artifactId>onos-net</artifactId>
+ <artifactId>onos-core</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <artifactId>onos-core</artifactId>
- <packaging>pom</packaging>
+ <artifactId>onos-core-trivial</artifactId>
+ <packaging>bundle</packaging>
- <description>ONOS network control core subsystems</description>
-
- <modules>
- <module>trivial</module>
- </modules>
+ <description>ONOS network control trivial implementations of core subsystems</description>
<dependencies>
<dependency>
@@ -26,10 +22,6 @@
<artifactId>onos-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
diff --git a/net/core/trivial/src/main/java/org/onlab/onos/event/impl/SimpleEventDispatcher.java b/core/trivial/src/main/java/org/onlab/onos/event/impl/SimpleEventDispatcher.java
similarity index 100%
rename from net/core/trivial/src/main/java/org/onlab/onos/event/impl/SimpleEventDispatcher.java
rename to core/trivial/src/main/java/org/onlab/onos/event/impl/SimpleEventDispatcher.java
diff --git a/net/core/trivial/src/main/java/org/onlab/onos/impl/GreetManager.java b/core/trivial/src/main/java/org/onlab/onos/impl/GreetManager.java
similarity index 100%
rename from net/core/trivial/src/main/java/org/onlab/onos/impl/GreetManager.java
rename to core/trivial/src/main/java/org/onlab/onos/impl/GreetManager.java
diff --git a/net/core/trivial/src/main/java/org/onlab/onos/impl/SomeOtherComponent.java b/core/trivial/src/main/java/org/onlab/onos/impl/SomeOtherComponent.java
similarity index 100%
rename from net/core/trivial/src/main/java/org/onlab/onos/impl/SomeOtherComponent.java
rename to core/trivial/src/main/java/org/onlab/onos/impl/SomeOtherComponent.java
diff --git a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/DefaultTopologyDescription.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/DefaultTopologyDescription.java
similarity index 100%
rename from net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/DefaultTopologyDescription.java
rename to core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/DefaultTopologyDescription.java
diff --git a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManager.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManager.java
similarity index 100%
rename from net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManager.java
rename to core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManager.java
diff --git a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceStore.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceStore.java
similarity index 100%
rename from net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceStore.java
rename to core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleDeviceStore.java
diff --git a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleHostManager.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleHostManager.java
similarity index 100%
rename from net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleHostManager.java
rename to core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleHostManager.java
diff --git a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleLinkManager.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleLinkManager.java
similarity index 100%
rename from net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleLinkManager.java
rename to core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleLinkManager.java
diff --git a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleLinkStore.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleLinkStore.java
similarity index 100%
rename from net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleLinkStore.java
rename to core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleLinkStore.java
diff --git a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleTopologyManager.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleTopologyManager.java
similarity index 100%
rename from net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleTopologyManager.java
rename to core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleTopologyManager.java
diff --git a/net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleTopologyStore.java b/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleTopologyStore.java
similarity index 100%
rename from net/core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleTopologyStore.java
rename to core/trivial/src/main/java/org/onlab/onos/net/trivial/impl/SimpleTopologyStore.java
diff --git a/net/core/trivial/src/main/javadoc/org/onlab/onos/event/impl/package.html b/core/trivial/src/main/javadoc/org/onlab/onos/event/impl/package.html
similarity index 100%
rename from net/core/trivial/src/main/javadoc/org/onlab/onos/event/impl/package.html
rename to core/trivial/src/main/javadoc/org/onlab/onos/event/impl/package.html
diff --git a/net/core/trivial/src/main/javadoc/org/onlab/onos/impl/package.html b/core/trivial/src/main/javadoc/org/onlab/onos/impl/package.html
similarity index 100%
rename from net/core/trivial/src/main/javadoc/org/onlab/onos/impl/package.html
rename to core/trivial/src/main/javadoc/org/onlab/onos/impl/package.html
diff --git a/net/core/trivial/src/main/javadoc/org/onlab/onos/net/trivial/impl/package.html b/core/trivial/src/main/javadoc/org/onlab/onos/net/trivial/impl/package.html
similarity index 100%
rename from net/core/trivial/src/main/javadoc/org/onlab/onos/net/trivial/impl/package.html
rename to core/trivial/src/main/javadoc/org/onlab/onos/net/trivial/impl/package.html
diff --git a/net/core/trivial/src/test/java/org/onlab/onos/impl/GreetManagerTest.java b/core/trivial/src/test/java/org/onlab/onos/impl/GreetManagerTest.java
similarity index 100%
rename from net/core/trivial/src/test/java/org/onlab/onos/impl/GreetManagerTest.java
rename to core/trivial/src/test/java/org/onlab/onos/impl/GreetManagerTest.java
diff --git a/net/core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManagerTest.java b/core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManagerTest.java
similarity index 100%
rename from net/core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManagerTest.java
rename to core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/SimpleDeviceManagerTest.java
diff --git a/net/core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/SimpleLinkManagerTest.java b/core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/SimpleLinkManagerTest.java
similarity index 100%
rename from net/core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/SimpleLinkManagerTest.java
rename to core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/SimpleLinkManagerTest.java
diff --git a/net/core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/TestEventDispatcher.java b/core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/TestEventDispatcher.java
similarity index 100%
rename from net/core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/TestEventDispatcher.java
rename to core/trivial/src/test/java/org/onlab/onos/net/trivial/impl/TestEventDispatcher.java
diff --git a/net/core/trivial/pom.xml b/net/core/trivial/pom.xml
deleted file mode 100644
index d4998ba..0000000
--- a/net/core/trivial/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onlab.onos</groupId>
- <artifactId>onos-core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>onos-core-trivial</artifactId>
- <packaging>bundle</packaging>
-
- <description>ONOS network control trivial implementations of core subsystems</description>
-
-</project>
diff --git a/pom.xml b/pom.xml
index 9fc49c8..3ec7f1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<modules>
<module>tools/build/conf</module>
<module>utils</module>
- <module>net</module>
+ <module>core</module>
<module>web</module>
<module>cli</module>
<module>providers</module>