diff --git a/apps/calendar/src/main/java/org/onlab/onos/calendar/BandwidthCalendarResource.java b/apps/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java
similarity index 100%
rename from apps/calendar/src/main/java/org/onlab/onos/calendar/BandwidthCalendarResource.java
rename to apps/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java
diff --git a/apps/calendar/src/main/java/org/onlab/onos/calendar/package-info.java b/apps/calendar/src/main/java/org/onosproject/calendar/package-info.java
similarity index 100%
rename from apps/calendar/src/main/java/org/onlab/onos/calendar/package-info.java
rename to apps/calendar/src/main/java/org/onosproject/calendar/package-info.java
diff --git a/apps/config/src/main/java/org/onlab/onos/config/AddressConfiguration.java b/apps/config/src/main/java/org/onosproject/config/AddressConfiguration.java
similarity index 100%
rename from apps/config/src/main/java/org/onlab/onos/config/AddressConfiguration.java
rename to apps/config/src/main/java/org/onosproject/config/AddressConfiguration.java
diff --git a/apps/config/src/main/java/org/onlab/onos/config/AddressEntry.java b/apps/config/src/main/java/org/onosproject/config/AddressEntry.java
similarity index 100%
rename from apps/config/src/main/java/org/onlab/onos/config/AddressEntry.java
rename to apps/config/src/main/java/org/onosproject/config/AddressEntry.java
diff --git a/apps/config/src/main/java/org/onlab/onos/config/NetworkConfigReader.java b/apps/config/src/main/java/org/onosproject/config/NetworkConfigReader.java
similarity index 100%
rename from apps/config/src/main/java/org/onlab/onos/config/NetworkConfigReader.java
rename to apps/config/src/main/java/org/onosproject/config/NetworkConfigReader.java
diff --git a/apps/config/src/main/java/org/onlab/onos/config/package-info.java b/apps/config/src/main/java/org/onosproject/config/package-info.java
similarity index 100%
rename from apps/config/src/main/java/org/onlab/onos/config/package-info.java
rename to apps/config/src/main/java/org/onosproject/config/package-info.java
diff --git a/apps/demo/src/main/java/org/onlab/onos/demo/DemoAPI.java b/apps/demo/src/main/java/org/onosproject/demo/DemoAPI.java
similarity index 100%
rename from apps/demo/src/main/java/org/onlab/onos/demo/DemoAPI.java
rename to apps/demo/src/main/java/org/onosproject/demo/DemoAPI.java
diff --git a/apps/demo/src/main/java/org/onlab/onos/demo/DemoInstaller.java b/apps/demo/src/main/java/org/onosproject/demo/DemoInstaller.java
similarity index 100%
rename from apps/demo/src/main/java/org/onlab/onos/demo/DemoInstaller.java
rename to apps/demo/src/main/java/org/onosproject/demo/DemoInstaller.java
diff --git a/apps/demo/src/main/java/org/onlab/onos/demo/DemoResource.java b/apps/demo/src/main/java/org/onosproject/demo/DemoResource.java
similarity index 100%
rename from apps/demo/src/main/java/org/onlab/onos/demo/DemoResource.java
rename to apps/demo/src/main/java/org/onosproject/demo/DemoResource.java
diff --git a/apps/demo/src/main/java/org/onlab/onos/demo/package-info.java b/apps/demo/src/main/java/org/onosproject/demo/package-info.java
similarity index 100%
rename from apps/demo/src/main/java/org/onlab/onos/demo/package-info.java
rename to apps/demo/src/main/java/org/onosproject/demo/package-info.java
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/FooComponent.java b/apps/foo/src/main/java/org/onosproject/foo/FooComponent.java
similarity index 100%
rename from apps/foo/src/main/java/org/onlab/onos/foo/FooComponent.java
rename to apps/foo/src/main/java/org/onosproject/foo/FooComponent.java
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/IOLoopTestClient.java b/apps/foo/src/main/java/org/onosproject/foo/IOLoopTestClient.java
similarity index 100%
rename from apps/foo/src/main/java/org/onlab/onos/foo/IOLoopTestClient.java
rename to apps/foo/src/main/java/org/onosproject/foo/IOLoopTestClient.java
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/IOLoopTestServer.java b/apps/foo/src/main/java/org/onosproject/foo/IOLoopTestServer.java
similarity index 100%
rename from apps/foo/src/main/java/org/onlab/onos/foo/IOLoopTestServer.java
rename to apps/foo/src/main/java/org/onosproject/foo/IOLoopTestServer.java
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/NettyEchoHandler.java b/apps/foo/src/main/java/org/onosproject/foo/NettyEchoHandler.java
similarity index 100%
rename from apps/foo/src/main/java/org/onlab/onos/foo/NettyEchoHandler.java
rename to apps/foo/src/main/java/org/onosproject/foo/NettyEchoHandler.java
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/NettyNothingHandler.java b/apps/foo/src/main/java/org/onosproject/foo/NettyNothingHandler.java
similarity index 100%
rename from apps/foo/src/main/java/org/onlab/onos/foo/NettyNothingHandler.java
rename to apps/foo/src/main/java/org/onosproject/foo/NettyNothingHandler.java
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyClient.java b/apps/foo/src/main/java/org/onosproject/foo/SimpleNettyClient.java
similarity index 100%
rename from apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyClient.java
rename to apps/foo/src/main/java/org/onosproject/foo/SimpleNettyClient.java
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyClientCommand.java b/apps/foo/src/main/java/org/onosproject/foo/SimpleNettyClientCommand.java
similarity index 100%
rename from apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyClientCommand.java
rename to apps/foo/src/main/java/org/onosproject/foo/SimpleNettyClientCommand.java
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java b/apps/foo/src/main/java/org/onosproject/foo/SimpleNettyServer.java
similarity index 100%
rename from apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java
rename to apps/foo/src/main/java/org/onosproject/foo/SimpleNettyServer.java
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServerCommand.java b/apps/foo/src/main/java/org/onosproject/foo/SimpleNettyServerCommand.java
similarity index 100%
rename from apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServerCommand.java
rename to apps/foo/src/main/java/org/onosproject/foo/SimpleNettyServerCommand.java
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/TestIOClientCommand.java b/apps/foo/src/main/java/org/onosproject/foo/TestIOClientCommand.java
similarity index 100%
rename from apps/foo/src/main/java/org/onlab/onos/foo/TestIOClientCommand.java
rename to apps/foo/src/main/java/org/onosproject/foo/TestIOClientCommand.java
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/TestIOServerCommand.java b/apps/foo/src/main/java/org/onosproject/foo/TestIOServerCommand.java
similarity index 100%
rename from apps/foo/src/main/java/org/onlab/onos/foo/TestIOServerCommand.java
rename to apps/foo/src/main/java/org/onosproject/foo/TestIOServerCommand.java
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/TestMessage.java b/apps/foo/src/main/java/org/onosproject/foo/TestMessage.java
similarity index 100%
rename from apps/foo/src/main/java/org/onlab/onos/foo/TestMessage.java
rename to apps/foo/src/main/java/org/onosproject/foo/TestMessage.java
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/TestMessageStream.java b/apps/foo/src/main/java/org/onosproject/foo/TestMessageStream.java
similarity index 100%
rename from apps/foo/src/main/java/org/onlab/onos/foo/TestMessageStream.java
rename to apps/foo/src/main/java/org/onosproject/foo/TestMessageStream.java
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/package-info.java b/apps/foo/src/main/java/org/onosproject/foo/package-info.java
similarity index 100%
rename from apps/foo/src/main/java/org/onlab/onos/foo/package-info.java
rename to apps/foo/src/main/java/org/onosproject/foo/package-info.java
diff --git a/apps/foo/src/main/resources/org/onlab/onos/foo/FooComponent.properties b/apps/foo/src/main/resources/org/onosproject/foo/FooComponent.properties
similarity index 100%
rename from apps/foo/src/main/resources/org/onlab/onos/foo/FooComponent.properties
rename to apps/foo/src/main/resources/org/onosproject/foo/FooComponent.properties
diff --git a/apps/fwd/src/main/java/org/onlab/onos/fwd/ReactiveForwarding.java b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
similarity index 100%
rename from apps/fwd/src/main/java/org/onlab/onos/fwd/ReactiveForwarding.java
rename to apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
diff --git a/apps/fwd/src/main/java/org/onlab/onos/fwd/package-info.java b/apps/fwd/src/main/java/org/onosproject/fwd/package-info.java
similarity index 100%
rename from apps/fwd/src/main/java/org/onlab/onos/fwd/package-info.java
rename to apps/fwd/src/main/java/org/onosproject/fwd/package-info.java
diff --git a/apps/ifwd/src/main/java/org/onlab/onos/ifwd/IntentReactiveForwarding.java b/apps/ifwd/src/main/java/org/onosproject/ifwd/IntentReactiveForwarding.java
similarity index 100%
rename from apps/ifwd/src/main/java/org/onlab/onos/ifwd/IntentReactiveForwarding.java
rename to apps/ifwd/src/main/java/org/onosproject/ifwd/IntentReactiveForwarding.java
diff --git a/apps/ifwd/src/main/java/org/onlab/onos/ifwd/package-info.java b/apps/ifwd/src/main/java/org/onosproject/ifwd/package-info.java
similarity index 100%
rename from apps/ifwd/src/main/java/org/onlab/onos/ifwd/package-info.java
rename to apps/ifwd/src/main/java/org/onosproject/ifwd/package-info.java
diff --git a/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetrics.java b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/IntentMetrics.java
similarity index 100%
rename from apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetrics.java
rename to apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/IntentMetrics.java
diff --git a/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetricsService.java b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/IntentMetricsService.java
similarity index 100%
rename from apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/IntentMetricsService.java
rename to apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/IntentMetricsService.java
diff --git a/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/cli/IntentEventsListCommand.java b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/IntentEventsListCommand.java
similarity index 100%
rename from apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/cli/IntentEventsListCommand.java
rename to apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/IntentEventsListCommand.java
diff --git a/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/cli/IntentEventsMetricsCommand.java b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/IntentEventsMetricsCommand.java
similarity index 100%
rename from apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/cli/IntentEventsMetricsCommand.java
rename to apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/IntentEventsMetricsCommand.java
diff --git a/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/cli/package-info.java b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/package-info.java
similarity index 100%
rename from apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/cli/package-info.java
rename to apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/cli/package-info.java
diff --git a/apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/package-info.java b/apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/package-info.java
similarity index 100%
rename from apps/metrics/intent/src/main/java/org/onlab/onos/metrics/intent/package-info.java
rename to apps/metrics/intent/src/main/java/org/onosproject/metrics/intent/package-info.java
diff --git a/apps/metrics/topology/src/main/java/org/onlab/onos/metrics/topology/TopologyMetrics.java b/apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/TopologyMetrics.java
similarity index 100%
rename from apps/metrics/topology/src/main/java/org/onlab/onos/metrics/topology/TopologyMetrics.java
rename to apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/TopologyMetrics.java
diff --git a/apps/metrics/topology/src/main/java/org/onlab/onos/metrics/topology/TopologyMetricsService.java b/apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/TopologyMetricsService.java
similarity index 100%
rename from apps/metrics/topology/src/main/java/org/onlab/onos/metrics/topology/TopologyMetricsService.java
rename to apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/TopologyMetricsService.java
diff --git a/apps/metrics/topology/src/main/java/org/onlab/onos/metrics/topology/cli/TopologyEventsListCommand.java b/apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/cli/TopologyEventsListCommand.java
similarity index 100%
rename from apps/metrics/topology/src/main/java/org/onlab/onos/metrics/topology/cli/TopologyEventsListCommand.java
rename to apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/cli/TopologyEventsListCommand.java
diff --git a/apps/metrics/topology/src/main/java/org/onlab/onos/metrics/topology/cli/TopologyEventsMetricsCommand.java b/apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/cli/TopologyEventsMetricsCommand.java
similarity index 100%
rename from apps/metrics/topology/src/main/java/org/onlab/onos/metrics/topology/cli/TopologyEventsMetricsCommand.java
rename to apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/cli/TopologyEventsMetricsCommand.java
diff --git a/apps/metrics/topology/src/main/java/org/onlab/onos/metrics/topology/cli/package-info.java b/apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/cli/package-info.java
similarity index 100%
rename from apps/metrics/topology/src/main/java/org/onlab/onos/metrics/topology/cli/package-info.java
rename to apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/cli/package-info.java
diff --git a/apps/metrics/topology/src/main/java/org/onlab/onos/metrics/topology/package-info.java b/apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/package-info.java
similarity index 100%
rename from apps/metrics/topology/src/main/java/org/onlab/onos/metrics/topology/package-info.java
rename to apps/metrics/topology/src/main/java/org/onosproject/metrics/topology/package-info.java
diff --git a/apps/mobility/src/main/java/org/onlab/onos/mobility/HostMobility.java b/apps/mobility/src/main/java/org/onosproject/mobility/HostMobility.java
similarity index 100%
rename from apps/mobility/src/main/java/org/onlab/onos/mobility/HostMobility.java
rename to apps/mobility/src/main/java/org/onosproject/mobility/HostMobility.java
diff --git a/apps/mobility/src/main/java/org/onlab/onos/mobility/package-info.java b/apps/mobility/src/main/java/org/onosproject/mobility/package-info.java
similarity index 100%
rename from apps/mobility/src/main/java/org/onlab/onos/mobility/package-info.java
rename to apps/mobility/src/main/java/org/onosproject/mobility/package-info.java
diff --git a/apps/oecfg/src/main/java/org/onlab/onos/oecfg/OELinkConfig.java b/apps/oecfg/src/main/java/org/onosproject/oecfg/OELinkConfig.java
similarity index 100%
rename from apps/oecfg/src/main/java/org/onlab/onos/oecfg/OELinkConfig.java
rename to apps/oecfg/src/main/java/org/onosproject/oecfg/OELinkConfig.java
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/OpticalLinkProvider.java b/apps/optical/src/main/java/org/onosproject/optical/OpticalLinkProvider.java
similarity index 100%
rename from apps/optical/src/main/java/org/onlab/onos/optical/OpticalLinkProvider.java
rename to apps/optical/src/main/java/org/onosproject/optical/OpticalLinkProvider.java
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/OpticalPathProvisioner.java b/apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
similarity index 100%
rename from apps/optical/src/main/java/org/onlab/onos/optical/OpticalPathProvisioner.java
rename to apps/optical/src/main/java/org/onosproject/optical/OpticalPathProvisioner.java
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalConfigProvider.java b/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalConfigProvider.java
similarity index 100%
rename from apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalConfigProvider.java
rename to apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalConfigProvider.java
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalLinkDescription.java b/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalLinkDescription.java
similarity index 100%
rename from apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalLinkDescription.java
rename to apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalLinkDescription.java
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalNetworkConfig.java b/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalNetworkConfig.java
similarity index 100%
rename from apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalNetworkConfig.java
rename to apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalNetworkConfig.java
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalSwitchDescription.java b/apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalSwitchDescription.java
similarity index 100%
rename from apps/optical/src/main/java/org/onlab/onos/optical/cfg/OpticalSwitchDescription.java
rename to apps/optical/src/main/java/org/onosproject/optical/cfg/OpticalSwitchDescription.java
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/cfg/PktOptLink.java b/apps/optical/src/main/java/org/onosproject/optical/cfg/PktOptLink.java
similarity index 100%
rename from apps/optical/src/main/java/org/onlab/onos/optical/cfg/PktOptLink.java
rename to apps/optical/src/main/java/org/onosproject/optical/cfg/PktOptLink.java
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/cfg/Roadm.java b/apps/optical/src/main/java/org/onosproject/optical/cfg/Roadm.java
similarity index 100%
rename from apps/optical/src/main/java/org/onlab/onos/optical/cfg/Roadm.java
rename to apps/optical/src/main/java/org/onosproject/optical/cfg/Roadm.java
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/cfg/WdmLink.java b/apps/optical/src/main/java/org/onosproject/optical/cfg/WdmLink.java
similarity index 100%
rename from apps/optical/src/main/java/org/onlab/onos/optical/cfg/WdmLink.java
rename to apps/optical/src/main/java/org/onosproject/optical/cfg/WdmLink.java
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/cfg/package-info.java b/apps/optical/src/main/java/org/onosproject/optical/cfg/package-info.java
similarity index 100%
rename from apps/optical/src/main/java/org/onlab/onos/optical/cfg/package-info.java
rename to apps/optical/src/main/java/org/onosproject/optical/cfg/package-info.java
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/package-info.java b/apps/optical/src/main/java/org/onosproject/optical/package-info.java
similarity index 100%
rename from apps/optical/src/main/java/org/onlab/onos/optical/package-info.java
rename to apps/optical/src/main/java/org/onosproject/optical/package-info.java
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/testapp/LambdaForwarding.java b/apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java
similarity index 100%
rename from apps/optical/src/main/java/org/onlab/onos/optical/testapp/LambdaForwarding.java
rename to apps/optical/src/main/java/org/onosproject/optical/testapp/LambdaForwarding.java
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/testapp/MPLSForwarding.java b/apps/optical/src/main/java/org/onosproject/optical/testapp/MPLSForwarding.java
similarity index 100%
rename from apps/optical/src/main/java/org/onlab/onos/optical/testapp/MPLSForwarding.java
rename to apps/optical/src/main/java/org/onosproject/optical/testapp/MPLSForwarding.java
diff --git a/apps/optical/src/main/java/org/onlab/onos/optical/testapp/package-info.java b/apps/optical/src/main/java/org/onosproject/optical/testapp/package-info.java
similarity index 100%
rename from apps/optical/src/main/java/org/onlab/onos/optical/testapp/package-info.java
rename to apps/optical/src/main/java/org/onosproject/optical/testapp/package-info.java
diff --git a/apps/proxyarp/src/main/java/org/onlab/onos/proxyarp/ProxyArp.java b/apps/proxyarp/src/main/java/org/onosproject/proxyarp/ProxyArp.java
similarity index 100%
rename from apps/proxyarp/src/main/java/org/onlab/onos/proxyarp/ProxyArp.java
rename to apps/proxyarp/src/main/java/org/onosproject/proxyarp/ProxyArp.java
diff --git a/apps/proxyarp/src/main/java/org/onlab/onos/proxyarp/package-info.java b/apps/proxyarp/src/main/java/org/onosproject/proxyarp/package-info.java
similarity index 100%
rename from apps/proxyarp/src/main/java/org/onlab/onos/proxyarp/package-info.java
rename to apps/proxyarp/src/main/java/org/onosproject/proxyarp/package-info.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/HostToInterfaceAdaptor.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/HostToInterfaceAdaptor.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/HostToInterfaceAdaptor.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/HostToInterfaceAdaptor.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/IntentSynchronizer.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/IntentSynchronizer.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/InterfaceService.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/InterfaceService.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/InterfaceService.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/InterfaceService.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/PeerConnectivityManager.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/PeerConnectivityManager.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/RouteEntry.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/RouteEntry.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/RouteEntry.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/RouteEntry.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/RouteListener.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/RouteListener.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/RouteListener.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/RouteListener.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/RouteUpdate.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/RouteUpdate.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/RouteUpdate.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/RouteUpdate.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/Router.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/Router.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/Router.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/Router.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/SdnIp.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/SdnIp.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/SdnIpService.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIpService.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/SdnIpService.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIpService.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpConstants.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/bgp/BgpConstants.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpConstants.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/bgp/BgpConstants.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpFrameDecoder.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/bgp/BgpFrameDecoder.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpFrameDecoder.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/bgp/BgpFrameDecoder.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpRouteEntry.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/bgp/BgpRouteEntry.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpRouteEntry.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/bgp/BgpRouteEntry.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpSession.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/bgp/BgpSession.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpSession.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/bgp/BgpSession.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpSessionManager.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/bgp/BgpSessionManager.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpSessionManager.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/bgp/BgpSessionManager.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/package-info.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/bgp/package-info.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/package-info.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/bgp/package-info.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/cli/BgpNeighborsListCommand.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/cli/BgpNeighborsListCommand.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/cli/BgpNeighborsListCommand.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/cli/BgpNeighborsListCommand.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/cli/BgpRoutesListCommand.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/cli/BgpRoutesListCommand.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/cli/BgpRoutesListCommand.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/cli/BgpRoutesListCommand.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/cli/PrimaryChangeCommand.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/cli/PrimaryChangeCommand.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/cli/PrimaryChangeCommand.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/cli/PrimaryChangeCommand.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/cli/RoutesListCommand.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/cli/RoutesListCommand.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/cli/RoutesListCommand.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/cli/RoutesListCommand.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/cli/package-info.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/cli/package-info.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/cli/package-info.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/cli/package-info.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/config/BgpPeer.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/config/BgpPeer.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/config/BgpPeer.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/config/BgpPeer.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/config/BgpSpeaker.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/config/BgpSpeaker.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/config/BgpSpeaker.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/config/BgpSpeaker.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/config/Configuration.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/config/Configuration.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/config/Configuration.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/config/Configuration.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/config/Interface.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/config/Interface.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/config/Interface.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/config/Interface.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/config/InterfaceAddress.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/config/InterfaceAddress.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/config/InterfaceAddress.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/config/InterfaceAddress.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/config/SdnIpConfigurationReader.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/config/SdnIpConfigurationReader.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/config/SdnIpConfigurationReader.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/config/SdnIpConfigurationReader.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/config/SdnIpConfigurationService.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/config/SdnIpConfigurationService.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/config/SdnIpConfigurationService.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/config/SdnIpConfigurationService.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/config/package-info.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/config/package-info.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/config/package-info.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/config/package-info.java
diff --git a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/package-info.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/package-info.java
similarity index 100%
rename from apps/sdnip/src/main/java/org/onlab/onos/sdnip/package-info.java
rename to apps/sdnip/src/main/java/org/onosproject/sdnip/package-info.java
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/HostToInterfaceAdaptorTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/HostToInterfaceAdaptorTest.java
similarity index 100%
rename from apps/sdnip/src/test/java/org/onlab/onos/sdnip/HostToInterfaceAdaptorTest.java
rename to apps/sdnip/src/test/java/org/onosproject/sdnip/HostToInterfaceAdaptorTest.java
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/IntentSyncTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java
similarity index 100%
rename from apps/sdnip/src/test/java/org/onlab/onos/sdnip/IntentSyncTest.java
rename to apps/sdnip/src/test/java/org/onosproject/sdnip/IntentSyncTest.java
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/PeerConnectivityManagerTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java
similarity index 100%
rename from apps/sdnip/src/test/java/org/onlab/onos/sdnip/PeerConnectivityManagerTest.java
rename to apps/sdnip/src/test/java/org/onosproject/sdnip/PeerConnectivityManagerTest.java
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouteEntryTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/RouteEntryTest.java
similarity index 100%
rename from apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouteEntryTest.java
rename to apps/sdnip/src/test/java/org/onosproject/sdnip/RouteEntryTest.java
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/RouterTest.java
similarity index 100%
rename from apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTest.java
rename to apps/sdnip/src/test/java/org/onosproject/sdnip/RouterTest.java
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTestWithAsyncArp.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/RouterTestWithAsyncArp.java
similarity index 100%
rename from apps/sdnip/src/test/java/org/onlab/onos/sdnip/RouterTestWithAsyncArp.java
rename to apps/sdnip/src/test/java/org/onosproject/sdnip/RouterTestWithAsyncArp.java
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/SdnIpTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpTest.java
similarity index 100%
rename from apps/sdnip/src/test/java/org/onlab/onos/sdnip/SdnIpTest.java
rename to apps/sdnip/src/test/java/org/onosproject/sdnip/SdnIpTest.java
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/TestHostService.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/TestHostService.java
similarity index 100%
rename from apps/sdnip/src/test/java/org/onlab/onos/sdnip/TestHostService.java
rename to apps/sdnip/src/test/java/org/onosproject/sdnip/TestHostService.java
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/TestIntentServiceHelper.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java
similarity index 100%
rename from apps/sdnip/src/test/java/org/onlab/onos/sdnip/TestIntentServiceHelper.java
rename to apps/sdnip/src/test/java/org/onosproject/sdnip/TestIntentServiceHelper.java
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/AsPathTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/bgp/AsPathTest.java
similarity index 100%
rename from apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/AsPathTest.java
rename to apps/sdnip/src/test/java/org/onosproject/sdnip/bgp/AsPathTest.java
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/BgpRouteEntryTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/bgp/BgpRouteEntryTest.java
similarity index 100%
rename from apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/BgpRouteEntryTest.java
rename to apps/sdnip/src/test/java/org/onosproject/sdnip/bgp/BgpRouteEntryTest.java
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/BgpSessionManagerTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/bgp/BgpSessionManagerTest.java
similarity index 100%
rename from apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/BgpSessionManagerTest.java
rename to apps/sdnip/src/test/java/org/onosproject/sdnip/bgp/BgpSessionManagerTest.java
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/PathSegmentTest.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/bgp/PathSegmentTest.java
similarity index 100%
rename from apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/PathSegmentTest.java
rename to apps/sdnip/src/test/java/org/onosproject/sdnip/bgp/PathSegmentTest.java
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/TestBgpPeerChannelHandler.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/bgp/TestBgpPeerChannelHandler.java
similarity index 100%
rename from apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/TestBgpPeerChannelHandler.java
rename to apps/sdnip/src/test/java/org/onosproject/sdnip/bgp/TestBgpPeerChannelHandler.java
diff --git a/apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/TestBgpPeerFrameDecoder.java b/apps/sdnip/src/test/java/org/onosproject/sdnip/bgp/TestBgpPeerFrameDecoder.java
similarity index 100%
rename from apps/sdnip/src/test/java/org/onlab/onos/sdnip/bgp/TestBgpPeerFrameDecoder.java
rename to apps/sdnip/src/test/java/org/onosproject/sdnip/bgp/TestBgpPeerFrameDecoder.java
diff --git a/apps/tvue/src/main/java/org/onlab/onos/tvue/TopologyResource.java b/apps/tvue/src/main/java/org/onosproject/tvue/TopologyResource.java
similarity index 100%
rename from apps/tvue/src/main/java/org/onlab/onos/tvue/TopologyResource.java
rename to apps/tvue/src/main/java/org/onosproject/tvue/TopologyResource.java
diff --git a/apps/tvue/src/main/java/org/onlab/onos/tvue/package-info.java b/apps/tvue/src/main/java/org/onosproject/tvue/package-info.java
similarity index 100%
rename from apps/tvue/src/main/java/org/onlab/onos/tvue/package-info.java
rename to apps/tvue/src/main/java/org/onosproject/tvue/package-info.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/AbstractShellCommand.java b/cli/src/main/java/org/onosproject/cli/AbstractShellCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/AbstractShellCommand.java
rename to cli/src/main/java/org/onosproject/cli/AbstractShellCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/ApplicationIdListCommand.java b/cli/src/main/java/org/onosproject/cli/ApplicationIdListCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/ApplicationIdListCommand.java
rename to cli/src/main/java/org/onosproject/cli/ApplicationIdListCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/BalanceMastersCommand.java b/cli/src/main/java/org/onosproject/cli/BalanceMastersCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/BalanceMastersCommand.java
rename to cli/src/main/java/org/onosproject/cli/BalanceMastersCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/Comparators.java b/cli/src/main/java/org/onosproject/cli/Comparators.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/Comparators.java
rename to cli/src/main/java/org/onosproject/cli/Comparators.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/MastersListCommand.java b/cli/src/main/java/org/onosproject/cli/MastersListCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/MastersListCommand.java
rename to cli/src/main/java/org/onosproject/cli/MastersListCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/MetricsListCommand.java b/cli/src/main/java/org/onosproject/cli/MetricsListCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/MetricsListCommand.java
rename to cli/src/main/java/org/onosproject/cli/MetricsListCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/NodeAddCommand.java b/cli/src/main/java/org/onosproject/cli/NodeAddCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/NodeAddCommand.java
rename to cli/src/main/java/org/onosproject/cli/NodeAddCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/NodeIdCompleter.java b/cli/src/main/java/org/onosproject/cli/NodeIdCompleter.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/NodeIdCompleter.java
rename to cli/src/main/java/org/onosproject/cli/NodeIdCompleter.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/NodeRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/NodeRemoveCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/NodeRemoveCommand.java
rename to cli/src/main/java/org/onosproject/cli/NodeRemoveCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/NodesListCommand.java b/cli/src/main/java/org/onosproject/cli/NodesListCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/NodesListCommand.java
rename to cli/src/main/java/org/onosproject/cli/NodesListCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/RolesCommand.java b/cli/src/main/java/org/onosproject/cli/RolesCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/RolesCommand.java
rename to cli/src/main/java/org/onosproject/cli/RolesCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/SummaryCommand.java b/cli/src/main/java/org/onosproject/cli/SummaryCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/SummaryCommand.java
rename to cli/src/main/java/org/onosproject/cli/SummaryCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/TabletAddCommand.java b/cli/src/main/java/org/onosproject/cli/TabletAddCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/TabletAddCommand.java
rename to cli/src/main/java/org/onosproject/cli/TabletAddCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/TabletLeaderCommand.java b/cli/src/main/java/org/onosproject/cli/TabletLeaderCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/TabletLeaderCommand.java
rename to cli/src/main/java/org/onosproject/cli/TabletLeaderCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/TabletMemberCommand.java b/cli/src/main/java/org/onosproject/cli/TabletMemberCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/TabletMemberCommand.java
rename to cli/src/main/java/org/onosproject/cli/TabletMemberCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/TabletRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/TabletRemoveCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/TabletRemoveCommand.java
rename to cli/src/main/java/org/onosproject/cli/TabletRemoveCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/AddFlowsCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddFlowsCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/AddFlowsCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/AddFlowsCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/AddHostToHostIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddHostToHostIntentCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/AddHostToHostIntentCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/AddHostToHostIntentCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/AddMultiPointToSinglePointIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddMultiPointToSinglePointIntentCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/AddMultiPointToSinglePointIntentCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/AddMultiPointToSinglePointIntentCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/AddOpticalIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddOpticalIntentCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/AddOpticalIntentCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/AddOpticalIntentCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/AddPointToPointIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddPointToPointIntentCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/AddPointToPointIntentCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/AddPointToPointIntentCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/AddSinglePointToMultiPointIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddSinglePointToMultiPointIntentCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/AddSinglePointToMultiPointIntentCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/AddSinglePointToMultiPointIntentCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/AddressBindingsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/AddressBindingsListCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/AddressBindingsListCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/AddressBindingsListCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/ClusterDevicesCommand.java b/cli/src/main/java/org/onosproject/cli/net/ClusterDevicesCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/ClusterDevicesCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/ClusterDevicesCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/ClusterIdCompleter.java b/cli/src/main/java/org/onosproject/cli/net/ClusterIdCompleter.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/ClusterIdCompleter.java
rename to cli/src/main/java/org/onosproject/cli/net/ClusterIdCompleter.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/ClusterLinksCommand.java b/cli/src/main/java/org/onosproject/cli/net/ClusterLinksCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/ClusterLinksCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/ClusterLinksCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/ClustersListCommand.java b/cli/src/main/java/org/onosproject/cli/net/ClustersListCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/ClustersListCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/ClustersListCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/ConnectPointCompleter.java b/cli/src/main/java/org/onosproject/cli/net/ConnectPointCompleter.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/ConnectPointCompleter.java
rename to cli/src/main/java/org/onosproject/cli/net/ConnectPointCompleter.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/ConnectivityIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/ConnectivityIntentCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/DeviceIdCompleter.java b/cli/src/main/java/org/onosproject/cli/net/DeviceIdCompleter.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/DeviceIdCompleter.java
rename to cli/src/main/java/org/onosproject/cli/net/DeviceIdCompleter.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/DevicePortsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/DevicePortsListCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/DevicePortsListCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/DeviceRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/net/DeviceRemoveCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/DeviceRemoveCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/DeviceRemoveCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/DeviceRoleCommand.java b/cli/src/main/java/org/onosproject/cli/net/DeviceRoleCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/DeviceRoleCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/DeviceRoleCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/DevicesListCommand.java b/cli/src/main/java/org/onosproject/cli/net/DevicesListCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/DevicesListCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/DevicesListCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/EthType.java b/cli/src/main/java/org/onosproject/cli/net/EthType.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/EthType.java
rename to cli/src/main/java/org/onosproject/cli/net/EthType.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/EthTypeCompleter.java b/cli/src/main/java/org/onosproject/cli/net/EthTypeCompleter.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/EthTypeCompleter.java
rename to cli/src/main/java/org/onosproject/cli/net/EthTypeCompleter.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/FlowRuleStatusCompleter.java b/cli/src/main/java/org/onosproject/cli/net/FlowRuleStatusCompleter.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/FlowRuleStatusCompleter.java
rename to cli/src/main/java/org/onosproject/cli/net/FlowRuleStatusCompleter.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/FlowsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/FlowsListCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/FlowsListCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/FlowsListCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/GetStatistics.java b/cli/src/main/java/org/onosproject/cli/net/GetStatistics.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/GetStatistics.java
rename to cli/src/main/java/org/onosproject/cli/net/GetStatistics.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/HostIdCompleter.java b/cli/src/main/java/org/onosproject/cli/net/HostIdCompleter.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/HostIdCompleter.java
rename to cli/src/main/java/org/onosproject/cli/net/HostIdCompleter.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/HostRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/net/HostRemoveCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/HostRemoveCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/HostRemoveCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/HostsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/HostsListCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/HostsListCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/HostsListCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/IntentIdCompleter.java b/cli/src/main/java/org/onosproject/cli/net/IntentIdCompleter.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/IntentIdCompleter.java
rename to cli/src/main/java/org/onosproject/cli/net/IntentIdCompleter.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/IntentPushTestCommand.java b/cli/src/main/java/org/onosproject/cli/net/IntentPushTestCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/IntentPushTestCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/IntentPushTestCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/IntentRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/net/IntentRemoveCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/IntentRemoveCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/IntentRemoveCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/IntentsListCommand.java b/cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/IntentsListCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/IntentsListCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/IpProtocol.java b/cli/src/main/java/org/onosproject/cli/net/IpProtocol.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/IpProtocol.java
rename to cli/src/main/java/org/onosproject/cli/net/IpProtocol.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/IpProtocolCompleter.java b/cli/src/main/java/org/onosproject/cli/net/IpProtocolCompleter.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/IpProtocolCompleter.java
rename to cli/src/main/java/org/onosproject/cli/net/IpProtocolCompleter.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/LeaderCommand.java b/cli/src/main/java/org/onosproject/cli/net/LeaderCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/LeaderCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/LeaderCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/LinksListCommand.java b/cli/src/main/java/org/onosproject/cli/net/LinksListCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/LinksListCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/LinksListCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/PathListCommand.java b/cli/src/main/java/org/onosproject/cli/net/PathListCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/PathListCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/PathListCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/RandomIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/RandomIntentCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/RandomIntentCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/RandomIntentCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/ResourceAllocationsCommand.java b/cli/src/main/java/org/onosproject/cli/net/ResourceAllocationsCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/ResourceAllocationsCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/ResourceAllocationsCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/ResourceAvailableCommand.java b/cli/src/main/java/org/onosproject/cli/net/ResourceAvailableCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/ResourceAvailableCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/ResourceAvailableCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/RoleCompleter.java b/cli/src/main/java/org/onosproject/cli/net/RoleCompleter.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/RoleCompleter.java
rename to cli/src/main/java/org/onosproject/cli/net/RoleCompleter.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/TopologyCommand.java b/cli/src/main/java/org/onosproject/cli/net/TopologyCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/TopologyCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/TopologyCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/WipeOutCommand.java b/cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/WipeOutCommand.java
rename to cli/src/main/java/org/onosproject/cli/net/WipeOutCommand.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/package-info.java b/cli/src/main/java/org/onosproject/cli/net/package-info.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/net/package-info.java
rename to cli/src/main/java/org/onosproject/cli/net/package-info.java
diff --git a/cli/src/main/java/org/onlab/onos/cli/package-info.java b/cli/src/main/java/org/onosproject/cli/package-info.java
similarity index 100%
rename from cli/src/main/java/org/onlab/onos/cli/package-info.java
rename to cli/src/main/java/org/onosproject/cli/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/ClusterAdminService.java b/core/api/src/main/java/org/onosproject/cluster/ClusterAdminService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/cluster/ClusterAdminService.java
rename to core/api/src/main/java/org/onosproject/cluster/ClusterAdminService.java
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/ClusterEvent.java b/core/api/src/main/java/org/onosproject/cluster/ClusterEvent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/cluster/ClusterEvent.java
rename to core/api/src/main/java/org/onosproject/cluster/ClusterEvent.java
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/ClusterEventListener.java b/core/api/src/main/java/org/onosproject/cluster/ClusterEventListener.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/cluster/ClusterEventListener.java
rename to core/api/src/main/java/org/onosproject/cluster/ClusterEventListener.java
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/ClusterService.java b/core/api/src/main/java/org/onosproject/cluster/ClusterService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/cluster/ClusterService.java
rename to core/api/src/main/java/org/onosproject/cluster/ClusterService.java
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/ClusterStore.java b/core/api/src/main/java/org/onosproject/cluster/ClusterStore.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/cluster/ClusterStore.java
rename to core/api/src/main/java/org/onosproject/cluster/ClusterStore.java
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/ClusterStoreDelegate.java b/core/api/src/main/java/org/onosproject/cluster/ClusterStoreDelegate.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/cluster/ClusterStoreDelegate.java
rename to core/api/src/main/java/org/onosproject/cluster/ClusterStoreDelegate.java
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/ControllerNode.java b/core/api/src/main/java/org/onosproject/cluster/ControllerNode.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/cluster/ControllerNode.java
rename to core/api/src/main/java/org/onosproject/cluster/ControllerNode.java
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/ControllerNodeToNodeId.java b/core/api/src/main/java/org/onosproject/cluster/ControllerNodeToNodeId.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/cluster/ControllerNodeToNodeId.java
rename to core/api/src/main/java/org/onosproject/cluster/ControllerNodeToNodeId.java
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/DefaultControllerNode.java b/core/api/src/main/java/org/onosproject/cluster/DefaultControllerNode.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/cluster/DefaultControllerNode.java
rename to core/api/src/main/java/org/onosproject/cluster/DefaultControllerNode.java
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/Leadership.java b/core/api/src/main/java/org/onosproject/cluster/Leadership.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/cluster/Leadership.java
rename to core/api/src/main/java/org/onosproject/cluster/Leadership.java
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/LeadershipEvent.java b/core/api/src/main/java/org/onosproject/cluster/LeadershipEvent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/cluster/LeadershipEvent.java
rename to core/api/src/main/java/org/onosproject/cluster/LeadershipEvent.java
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/LeadershipEventListener.java b/core/api/src/main/java/org/onosproject/cluster/LeadershipEventListener.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/cluster/LeadershipEventListener.java
rename to core/api/src/main/java/org/onosproject/cluster/LeadershipEventListener.java
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/LeadershipService.java b/core/api/src/main/java/org/onosproject/cluster/LeadershipService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/cluster/LeadershipService.java
rename to core/api/src/main/java/org/onosproject/cluster/LeadershipService.java
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/NodeId.java b/core/api/src/main/java/org/onosproject/cluster/NodeId.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/cluster/NodeId.java
rename to core/api/src/main/java/org/onosproject/cluster/NodeId.java
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/RoleInfo.java b/core/api/src/main/java/org/onosproject/cluster/RoleInfo.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/cluster/RoleInfo.java
rename to core/api/src/main/java/org/onosproject/cluster/RoleInfo.java
diff --git a/core/api/src/main/java/org/onlab/onos/cluster/package-info.java b/core/api/src/main/java/org/onosproject/cluster/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/cluster/package-info.java
rename to core/api/src/main/java/org/onosproject/cluster/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/codec/CodecContext.java b/core/api/src/main/java/org/onosproject/codec/CodecContext.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/codec/CodecContext.java
rename to core/api/src/main/java/org/onosproject/codec/CodecContext.java
diff --git a/core/api/src/main/java/org/onlab/onos/codec/CodecService.java b/core/api/src/main/java/org/onosproject/codec/CodecService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/codec/CodecService.java
rename to core/api/src/main/java/org/onosproject/codec/CodecService.java
diff --git a/core/api/src/main/java/org/onlab/onos/codec/JsonCodec.java b/core/api/src/main/java/org/onosproject/codec/JsonCodec.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/codec/JsonCodec.java
rename to core/api/src/main/java/org/onosproject/codec/JsonCodec.java
diff --git a/core/api/src/main/java/org/onlab/onos/codec/package-info.java b/core/api/src/main/java/org/onosproject/codec/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/codec/package-info.java
rename to core/api/src/main/java/org/onosproject/codec/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/core/ApplicationId.java b/core/api/src/main/java/org/onosproject/core/ApplicationId.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/core/ApplicationId.java
rename to core/api/src/main/java/org/onosproject/core/ApplicationId.java
diff --git a/core/api/src/main/java/org/onlab/onos/core/ApplicationIdStore.java b/core/api/src/main/java/org/onosproject/core/ApplicationIdStore.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/core/ApplicationIdStore.java
rename to core/api/src/main/java/org/onosproject/core/ApplicationIdStore.java
diff --git a/core/api/src/main/java/org/onlab/onos/core/CoreService.java b/core/api/src/main/java/org/onosproject/core/CoreService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/core/CoreService.java
rename to core/api/src/main/java/org/onosproject/core/CoreService.java
diff --git a/core/api/src/main/java/org/onlab/onos/core/DefaultApplicationId.java b/core/api/src/main/java/org/onosproject/core/DefaultApplicationId.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/core/DefaultApplicationId.java
rename to core/api/src/main/java/org/onosproject/core/DefaultApplicationId.java
diff --git a/core/api/src/main/java/org/onlab/onos/core/DefaultGroupId.java b/core/api/src/main/java/org/onosproject/core/DefaultGroupId.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/core/DefaultGroupId.java
rename to core/api/src/main/java/org/onosproject/core/DefaultGroupId.java
diff --git a/core/api/src/main/java/org/onlab/onos/core/GroupId.java b/core/api/src/main/java/org/onosproject/core/GroupId.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/core/GroupId.java
rename to core/api/src/main/java/org/onosproject/core/GroupId.java
diff --git a/core/api/src/main/java/org/onlab/onos/core/IdBlock.java b/core/api/src/main/java/org/onosproject/core/IdBlock.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/core/IdBlock.java
rename to core/api/src/main/java/org/onosproject/core/IdBlock.java
diff --git a/core/api/src/main/java/org/onlab/onos/core/IdBlockStore.java b/core/api/src/main/java/org/onosproject/core/IdBlockStore.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/core/IdBlockStore.java
rename to core/api/src/main/java/org/onosproject/core/IdBlockStore.java
diff --git a/core/api/src/main/java/org/onlab/onos/core/IdGenerator.java b/core/api/src/main/java/org/onosproject/core/IdGenerator.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/core/IdGenerator.java
rename to core/api/src/main/java/org/onosproject/core/IdGenerator.java
diff --git a/core/api/src/main/java/org/onlab/onos/core/MetricsHelper.java b/core/api/src/main/java/org/onosproject/core/MetricsHelper.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/core/MetricsHelper.java
rename to core/api/src/main/java/org/onosproject/core/MetricsHelper.java
diff --git a/core/api/src/main/java/org/onlab/onos/core/UnavailableIdException.java b/core/api/src/main/java/org/onosproject/core/UnavailableIdException.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/core/UnavailableIdException.java
rename to core/api/src/main/java/org/onosproject/core/UnavailableIdException.java
diff --git a/core/api/src/main/java/org/onlab/onos/core/Version.java b/core/api/src/main/java/org/onosproject/core/Version.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/core/Version.java
rename to core/api/src/main/java/org/onosproject/core/Version.java
diff --git a/core/api/src/main/java/org/onlab/onos/core/package-info.java b/core/api/src/main/java/org/onosproject/core/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/core/package-info.java
rename to core/api/src/main/java/org/onosproject/core/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/event/AbstractEvent.java b/core/api/src/main/java/org/onosproject/event/AbstractEvent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/event/AbstractEvent.java
rename to core/api/src/main/java/org/onosproject/event/AbstractEvent.java
diff --git a/core/api/src/main/java/org/onlab/onos/event/AbstractEventAccumulator.java b/core/api/src/main/java/org/onosproject/event/AbstractEventAccumulator.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/event/AbstractEventAccumulator.java
rename to core/api/src/main/java/org/onosproject/event/AbstractEventAccumulator.java
diff --git a/core/api/src/main/java/org/onlab/onos/event/AbstractListenerRegistry.java b/core/api/src/main/java/org/onosproject/event/AbstractListenerRegistry.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/event/AbstractListenerRegistry.java
rename to core/api/src/main/java/org/onosproject/event/AbstractListenerRegistry.java
diff --git a/core/api/src/main/java/org/onlab/onos/event/DefaultEventSinkRegistry.java b/core/api/src/main/java/org/onosproject/event/DefaultEventSinkRegistry.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/event/DefaultEventSinkRegistry.java
rename to core/api/src/main/java/org/onosproject/event/DefaultEventSinkRegistry.java
diff --git a/core/api/src/main/java/org/onlab/onos/event/Event.java b/core/api/src/main/java/org/onosproject/event/Event.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/event/Event.java
rename to core/api/src/main/java/org/onosproject/event/Event.java
diff --git a/core/api/src/main/java/org/onlab/onos/event/EventAccumulator.java b/core/api/src/main/java/org/onosproject/event/EventAccumulator.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/event/EventAccumulator.java
rename to core/api/src/main/java/org/onosproject/event/EventAccumulator.java
diff --git a/core/api/src/main/java/org/onlab/onos/event/EventDeliveryService.java b/core/api/src/main/java/org/onosproject/event/EventDeliveryService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/event/EventDeliveryService.java
rename to core/api/src/main/java/org/onosproject/event/EventDeliveryService.java
diff --git a/core/api/src/main/java/org/onlab/onos/event/EventDispatcher.java b/core/api/src/main/java/org/onosproject/event/EventDispatcher.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/event/EventDispatcher.java
rename to core/api/src/main/java/org/onosproject/event/EventDispatcher.java
diff --git a/core/api/src/main/java/org/onlab/onos/event/EventListener.java b/core/api/src/main/java/org/onosproject/event/EventListener.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/event/EventListener.java
rename to core/api/src/main/java/org/onosproject/event/EventListener.java
diff --git a/core/api/src/main/java/org/onlab/onos/event/EventSink.java b/core/api/src/main/java/org/onosproject/event/EventSink.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/event/EventSink.java
rename to core/api/src/main/java/org/onosproject/event/EventSink.java
diff --git a/core/api/src/main/java/org/onlab/onos/event/EventSinkRegistry.java b/core/api/src/main/java/org/onosproject/event/EventSinkRegistry.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/event/EventSinkRegistry.java
rename to core/api/src/main/java/org/onosproject/event/EventSinkRegistry.java
diff --git a/core/api/src/main/java/org/onlab/onos/event/package-info.java b/core/api/src/main/java/org/onosproject/event/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/event/package-info.java
rename to core/api/src/main/java/org/onosproject/event/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/mastership/MastershipAdminService.java b/core/api/src/main/java/org/onosproject/mastership/MastershipAdminService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/mastership/MastershipAdminService.java
rename to core/api/src/main/java/org/onosproject/mastership/MastershipAdminService.java
diff --git a/core/api/src/main/java/org/onlab/onos/mastership/MastershipEvent.java b/core/api/src/main/java/org/onosproject/mastership/MastershipEvent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/mastership/MastershipEvent.java
rename to core/api/src/main/java/org/onosproject/mastership/MastershipEvent.java
diff --git a/core/api/src/main/java/org/onlab/onos/mastership/MastershipListener.java b/core/api/src/main/java/org/onosproject/mastership/MastershipListener.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/mastership/MastershipListener.java
rename to core/api/src/main/java/org/onosproject/mastership/MastershipListener.java
diff --git a/core/api/src/main/java/org/onlab/onos/mastership/MastershipService.java b/core/api/src/main/java/org/onosproject/mastership/MastershipService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/mastership/MastershipService.java
rename to core/api/src/main/java/org/onosproject/mastership/MastershipService.java
diff --git a/core/api/src/main/java/org/onlab/onos/mastership/MastershipStore.java b/core/api/src/main/java/org/onosproject/mastership/MastershipStore.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/mastership/MastershipStore.java
rename to core/api/src/main/java/org/onosproject/mastership/MastershipStore.java
diff --git a/core/api/src/main/java/org/onlab/onos/mastership/MastershipStoreDelegate.java b/core/api/src/main/java/org/onosproject/mastership/MastershipStoreDelegate.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/mastership/MastershipStoreDelegate.java
rename to core/api/src/main/java/org/onosproject/mastership/MastershipStoreDelegate.java
diff --git a/core/api/src/main/java/org/onlab/onos/mastership/MastershipTerm.java b/core/api/src/main/java/org/onosproject/mastership/MastershipTerm.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/mastership/MastershipTerm.java
rename to core/api/src/main/java/org/onosproject/mastership/MastershipTerm.java
diff --git a/core/api/src/main/java/org/onlab/onos/mastership/MastershipTermService.java b/core/api/src/main/java/org/onosproject/mastership/MastershipTermService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/mastership/MastershipTermService.java
rename to core/api/src/main/java/org/onosproject/mastership/MastershipTermService.java
diff --git a/core/api/src/main/java/org/onlab/onos/mastership/package-info.java b/core/api/src/main/java/org/onosproject/mastership/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/mastership/package-info.java
rename to core/api/src/main/java/org/onosproject/mastership/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/AbstractAnnotated.java b/core/api/src/main/java/org/onosproject/net/AbstractAnnotated.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/AbstractAnnotated.java
rename to core/api/src/main/java/org/onosproject/net/AbstractAnnotated.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/AbstractDescription.java b/core/api/src/main/java/org/onosproject/net/AbstractDescription.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/AbstractDescription.java
rename to core/api/src/main/java/org/onosproject/net/AbstractDescription.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/AbstractElement.java b/core/api/src/main/java/org/onosproject/net/AbstractElement.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/AbstractElement.java
rename to core/api/src/main/java/org/onosproject/net/AbstractElement.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/AbstractModel.java b/core/api/src/main/java/org/onosproject/net/AbstractModel.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/AbstractModel.java
rename to core/api/src/main/java/org/onosproject/net/AbstractModel.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/Annotated.java b/core/api/src/main/java/org/onosproject/net/Annotated.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/Annotated.java
rename to core/api/src/main/java/org/onosproject/net/Annotated.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/AnnotationKeys.java b/core/api/src/main/java/org/onosproject/net/AnnotationKeys.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/AnnotationKeys.java
rename to core/api/src/main/java/org/onosproject/net/AnnotationKeys.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/Annotations.java b/core/api/src/main/java/org/onosproject/net/Annotations.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/Annotations.java
rename to core/api/src/main/java/org/onosproject/net/Annotations.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/AnnotationsUtil.java b/core/api/src/main/java/org/onosproject/net/AnnotationsUtil.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/AnnotationsUtil.java
rename to core/api/src/main/java/org/onosproject/net/AnnotationsUtil.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/ConnectPoint.java b/core/api/src/main/java/org/onosproject/net/ConnectPoint.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/ConnectPoint.java
rename to core/api/src/main/java/org/onosproject/net/ConnectPoint.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/DefaultAnnotations.java b/core/api/src/main/java/org/onosproject/net/DefaultAnnotations.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/DefaultAnnotations.java
rename to core/api/src/main/java/org/onosproject/net/DefaultAnnotations.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/DefaultDevice.java b/core/api/src/main/java/org/onosproject/net/DefaultDevice.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/DefaultDevice.java
rename to core/api/src/main/java/org/onosproject/net/DefaultDevice.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/DefaultEdgeLink.java b/core/api/src/main/java/org/onosproject/net/DefaultEdgeLink.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/DefaultEdgeLink.java
rename to core/api/src/main/java/org/onosproject/net/DefaultEdgeLink.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/DefaultHost.java b/core/api/src/main/java/org/onosproject/net/DefaultHost.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/DefaultHost.java
rename to core/api/src/main/java/org/onosproject/net/DefaultHost.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/DefaultLink.java b/core/api/src/main/java/org/onosproject/net/DefaultLink.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/DefaultLink.java
rename to core/api/src/main/java/org/onosproject/net/DefaultLink.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/DefaultPath.java b/core/api/src/main/java/org/onosproject/net/DefaultPath.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/DefaultPath.java
rename to core/api/src/main/java/org/onosproject/net/DefaultPath.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/DefaultPort.java b/core/api/src/main/java/org/onosproject/net/DefaultPort.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/DefaultPort.java
rename to core/api/src/main/java/org/onosproject/net/DefaultPort.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/Description.java b/core/api/src/main/java/org/onosproject/net/Description.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/Description.java
rename to core/api/src/main/java/org/onosproject/net/Description.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/Device.java b/core/api/src/main/java/org/onosproject/net/Device.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/Device.java
rename to core/api/src/main/java/org/onosproject/net/Device.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/DeviceId.java b/core/api/src/main/java/org/onosproject/net/DeviceId.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/DeviceId.java
rename to core/api/src/main/java/org/onosproject/net/DeviceId.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/EdgeLink.java b/core/api/src/main/java/org/onosproject/net/EdgeLink.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/EdgeLink.java
rename to core/api/src/main/java/org/onosproject/net/EdgeLink.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/Element.java b/core/api/src/main/java/org/onosproject/net/Element.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/Element.java
rename to core/api/src/main/java/org/onosproject/net/Element.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/ElementId.java b/core/api/src/main/java/org/onosproject/net/ElementId.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/ElementId.java
rename to core/api/src/main/java/org/onosproject/net/ElementId.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/Host.java b/core/api/src/main/java/org/onosproject/net/Host.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/Host.java
rename to core/api/src/main/java/org/onosproject/net/Host.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/HostId.java b/core/api/src/main/java/org/onosproject/net/HostId.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/HostId.java
rename to core/api/src/main/java/org/onosproject/net/HostId.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/HostLocation.java b/core/api/src/main/java/org/onosproject/net/HostLocation.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/HostLocation.java
rename to core/api/src/main/java/org/onosproject/net/HostLocation.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/Link.java b/core/api/src/main/java/org/onosproject/net/Link.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/Link.java
rename to core/api/src/main/java/org/onosproject/net/Link.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/LinkKey.java b/core/api/src/main/java/org/onosproject/net/LinkKey.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/LinkKey.java
rename to core/api/src/main/java/org/onosproject/net/LinkKey.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/MastershipRole.java b/core/api/src/main/java/org/onosproject/net/MastershipRole.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/MastershipRole.java
rename to core/api/src/main/java/org/onosproject/net/MastershipRole.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/NetworkResource.java b/core/api/src/main/java/org/onosproject/net/NetworkResource.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/NetworkResource.java
rename to core/api/src/main/java/org/onosproject/net/NetworkResource.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/Path.java b/core/api/src/main/java/org/onosproject/net/Path.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/Path.java
rename to core/api/src/main/java/org/onosproject/net/Path.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/Port.java b/core/api/src/main/java/org/onosproject/net/Port.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/Port.java
rename to core/api/src/main/java/org/onosproject/net/Port.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/PortNumber.java b/core/api/src/main/java/org/onosproject/net/PortNumber.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/PortNumber.java
rename to core/api/src/main/java/org/onosproject/net/PortNumber.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/Provided.java b/core/api/src/main/java/org/onosproject/net/Provided.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/Provided.java
rename to core/api/src/main/java/org/onosproject/net/Provided.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/SparseAnnotations.java b/core/api/src/main/java/org/onosproject/net/SparseAnnotations.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/SparseAnnotations.java
rename to core/api/src/main/java/org/onosproject/net/SparseAnnotations.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/Tunnel.java b/core/api/src/main/java/org/onosproject/net/Tunnel.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/Tunnel.java
rename to core/api/src/main/java/org/onosproject/net/Tunnel.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DefaultDeviceDescription.java b/core/api/src/main/java/org/onosproject/net/device/DefaultDeviceDescription.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/device/DefaultDeviceDescription.java
rename to core/api/src/main/java/org/onosproject/net/device/DefaultDeviceDescription.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DefaultPortDescription.java b/core/api/src/main/java/org/onosproject/net/device/DefaultPortDescription.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/device/DefaultPortDescription.java
rename to core/api/src/main/java/org/onosproject/net/device/DefaultPortDescription.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DeviceAdminService.java b/core/api/src/main/java/org/onosproject/net/device/DeviceAdminService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/device/DeviceAdminService.java
rename to core/api/src/main/java/org/onosproject/net/device/DeviceAdminService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DeviceClockProviderService.java b/core/api/src/main/java/org/onosproject/net/device/DeviceClockProviderService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/device/DeviceClockProviderService.java
rename to core/api/src/main/java/org/onosproject/net/device/DeviceClockProviderService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DeviceClockService.java b/core/api/src/main/java/org/onosproject/net/device/DeviceClockService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/device/DeviceClockService.java
rename to core/api/src/main/java/org/onosproject/net/device/DeviceClockService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DeviceDescription.java b/core/api/src/main/java/org/onosproject/net/device/DeviceDescription.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/device/DeviceDescription.java
rename to core/api/src/main/java/org/onosproject/net/device/DeviceDescription.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DeviceEvent.java b/core/api/src/main/java/org/onosproject/net/device/DeviceEvent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/device/DeviceEvent.java
rename to core/api/src/main/java/org/onosproject/net/device/DeviceEvent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DeviceListener.java b/core/api/src/main/java/org/onosproject/net/device/DeviceListener.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/device/DeviceListener.java
rename to core/api/src/main/java/org/onosproject/net/device/DeviceListener.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DeviceProvider.java b/core/api/src/main/java/org/onosproject/net/device/DeviceProvider.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/device/DeviceProvider.java
rename to core/api/src/main/java/org/onosproject/net/device/DeviceProvider.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DeviceProviderRegistry.java b/core/api/src/main/java/org/onosproject/net/device/DeviceProviderRegistry.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/device/DeviceProviderRegistry.java
rename to core/api/src/main/java/org/onosproject/net/device/DeviceProviderRegistry.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DeviceProviderService.java b/core/api/src/main/java/org/onosproject/net/device/DeviceProviderService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/device/DeviceProviderService.java
rename to core/api/src/main/java/org/onosproject/net/device/DeviceProviderService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DeviceService.java b/core/api/src/main/java/org/onosproject/net/device/DeviceService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/device/DeviceService.java
rename to core/api/src/main/java/org/onosproject/net/device/DeviceService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DeviceStore.java b/core/api/src/main/java/org/onosproject/net/device/DeviceStore.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/device/DeviceStore.java
rename to core/api/src/main/java/org/onosproject/net/device/DeviceStore.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/DeviceStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/device/DeviceStoreDelegate.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/device/DeviceStoreDelegate.java
rename to core/api/src/main/java/org/onosproject/net/device/DeviceStoreDelegate.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/PortDescription.java b/core/api/src/main/java/org/onosproject/net/device/PortDescription.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/device/PortDescription.java
rename to core/api/src/main/java/org/onosproject/net/device/PortDescription.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/device/package-info.java b/core/api/src/main/java/org/onosproject/net/device/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/device/package-info.java
rename to core/api/src/main/java/org/onosproject/net/device/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/BatchOperation.java b/core/api/src/main/java/org/onosproject/net/flow/BatchOperation.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/BatchOperation.java
rename to core/api/src/main/java/org/onosproject/net/flow/BatchOperation.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationEntry.java b/core/api/src/main/java/org/onosproject/net/flow/BatchOperationEntry.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationEntry.java
rename to core/api/src/main/java/org/onosproject/net/flow/BatchOperationEntry.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationResult.java b/core/api/src/main/java/org/onosproject/net/flow/BatchOperationResult.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationResult.java
rename to core/api/src/main/java/org/onosproject/net/flow/BatchOperationResult.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationTarget.java b/core/api/src/main/java/org/onosproject/net/flow/BatchOperationTarget.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationTarget.java
rename to core/api/src/main/java/org/onosproject/net/flow/BatchOperationTarget.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/CompletedBatchOperation.java b/core/api/src/main/java/org/onosproject/net/flow/CompletedBatchOperation.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/CompletedBatchOperation.java
rename to core/api/src/main/java/org/onosproject/net/flow/CompletedBatchOperation.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowEntry.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowEntry.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowEntry.java
rename to core/api/src/main/java/org/onosproject/net/flow/DefaultFlowEntry.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowRule.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultFlowRule.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowRule.java
rename to core/api/src/main/java/org/onosproject/net/flow/DefaultFlowRule.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficSelector.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficSelector.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficSelector.java
rename to core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficSelector.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficTreatment.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficTreatment.java
rename to core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowEntry.java b/core/api/src/main/java/org/onosproject/net/flow/FlowEntry.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/FlowEntry.java
rename to core/api/src/main/java/org/onosproject/net/flow/FlowEntry.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowId.java b/core/api/src/main/java/org/onosproject/net/flow/FlowId.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/FlowId.java
rename to core/api/src/main/java/org/onosproject/net/flow/FlowId.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRule.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRule.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/FlowRule.java
rename to core/api/src/main/java/org/onosproject/net/flow/FlowRule.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleBatchEntry.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchEntry.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleBatchEntry.java
rename to core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchEntry.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleBatchEvent.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchEvent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleBatchEvent.java
rename to core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchEvent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleBatchOperation.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchOperation.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleBatchOperation.java
rename to core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchOperation.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleBatchRequest.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchRequest.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleBatchRequest.java
rename to core/api/src/main/java/org/onosproject/net/flow/FlowRuleBatchRequest.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleEvent.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleEvent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleEvent.java
rename to core/api/src/main/java/org/onosproject/net/flow/FlowRuleEvent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleListener.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleListener.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleListener.java
rename to core/api/src/main/java/org/onosproject/net/flow/FlowRuleListener.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProvider.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleProvider.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProvider.java
rename to core/api/src/main/java/org/onosproject/net/flow/FlowRuleProvider.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderRegistry.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleProviderRegistry.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderRegistry.java
rename to core/api/src/main/java/org/onosproject/net/flow/FlowRuleProviderRegistry.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleProviderService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java
rename to core/api/src/main/java/org/onosproject/net/flow/FlowRuleProviderService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleService.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleService.java
rename to core/api/src/main/java/org/onosproject/net/flow/FlowRuleService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleStore.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleStore.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleStore.java
rename to core/api/src/main/java/org/onosproject/net/flow/FlowRuleStore.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/flow/FlowRuleStoreDelegate.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleStoreDelegate.java
rename to core/api/src/main/java/org/onosproject/net/flow/FlowRuleStoreDelegate.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/StoredFlowEntry.java b/core/api/src/main/java/org/onosproject/net/flow/StoredFlowEntry.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/StoredFlowEntry.java
rename to core/api/src/main/java/org/onosproject/net/flow/StoredFlowEntry.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/TrafficSelector.java b/core/api/src/main/java/org/onosproject/net/flow/TrafficSelector.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/TrafficSelector.java
rename to core/api/src/main/java/org/onosproject/net/flow/TrafficSelector.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/TrafficTreatment.java b/core/api/src/main/java/org/onosproject/net/flow/TrafficTreatment.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/TrafficTreatment.java
rename to core/api/src/main/java/org/onosproject/net/flow/TrafficTreatment.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/Treatment.java b/core/api/src/main/java/org/onosproject/net/flow/Treatment.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/Treatment.java
rename to core/api/src/main/java/org/onosproject/net/flow/Treatment.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java
rename to core/api/src/main/java/org/onosproject/net/flow/criteria/Criteria.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criterion.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/Criterion.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criterion.java
rename to core/api/src/main/java/org/onosproject/net/flow/criteria/Criterion.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/package-info.java b/core/api/src/main/java/org/onosproject/net/flow/criteria/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/criteria/package-info.java
rename to core/api/src/main/java/org/onosproject/net/flow/criteria/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/Instruction.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/Instruction.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/instructions/Instruction.java
rename to core/api/src/main/java/org/onosproject/net/flow/instructions/Instruction.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/Instructions.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/instructions/Instructions.java
rename to core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L0ModificationInstruction.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/L0ModificationInstruction.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/instructions/L0ModificationInstruction.java
rename to core/api/src/main/java/org/onosproject/net/flow/instructions/L0ModificationInstruction.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/L2ModificationInstruction.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java
rename to core/api/src/main/java/org/onosproject/net/flow/instructions/L2ModificationInstruction.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L3ModificationInstruction.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/L3ModificationInstruction.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/instructions/L3ModificationInstruction.java
rename to core/api/src/main/java/org/onosproject/net/flow/instructions/L3ModificationInstruction.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/package-info.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/instructions/package-info.java
rename to core/api/src/main/java/org/onosproject/net/flow/instructions/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/package-info.java b/core/api/src/main/java/org/onosproject/net/flow/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/flow/package-info.java
rename to core/api/src/main/java/org/onosproject/net/flow/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/DefaultHostDescription.java b/core/api/src/main/java/org/onosproject/net/host/DefaultHostDescription.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/host/DefaultHostDescription.java
rename to core/api/src/main/java/org/onosproject/net/host/DefaultHostDescription.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostAdminService.java b/core/api/src/main/java/org/onosproject/net/host/HostAdminService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/host/HostAdminService.java
rename to core/api/src/main/java/org/onosproject/net/host/HostAdminService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostClockService.java b/core/api/src/main/java/org/onosproject/net/host/HostClockService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/host/HostClockService.java
rename to core/api/src/main/java/org/onosproject/net/host/HostClockService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostDescription.java b/core/api/src/main/java/org/onosproject/net/host/HostDescription.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/host/HostDescription.java
rename to core/api/src/main/java/org/onosproject/net/host/HostDescription.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostEvent.java b/core/api/src/main/java/org/onosproject/net/host/HostEvent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/host/HostEvent.java
rename to core/api/src/main/java/org/onosproject/net/host/HostEvent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostListener.java b/core/api/src/main/java/org/onosproject/net/host/HostListener.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/host/HostListener.java
rename to core/api/src/main/java/org/onosproject/net/host/HostListener.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostProvider.java b/core/api/src/main/java/org/onosproject/net/host/HostProvider.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/host/HostProvider.java
rename to core/api/src/main/java/org/onosproject/net/host/HostProvider.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostProviderRegistry.java b/core/api/src/main/java/org/onosproject/net/host/HostProviderRegistry.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/host/HostProviderRegistry.java
rename to core/api/src/main/java/org/onosproject/net/host/HostProviderRegistry.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostProviderService.java b/core/api/src/main/java/org/onosproject/net/host/HostProviderService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/host/HostProviderService.java
rename to core/api/src/main/java/org/onosproject/net/host/HostProviderService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostService.java b/core/api/src/main/java/org/onosproject/net/host/HostService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/host/HostService.java
rename to core/api/src/main/java/org/onosproject/net/host/HostService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostStore.java b/core/api/src/main/java/org/onosproject/net/host/HostStore.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/host/HostStore.java
rename to core/api/src/main/java/org/onosproject/net/host/HostStore.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/HostStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/host/HostStoreDelegate.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/host/HostStoreDelegate.java
rename to core/api/src/main/java/org/onosproject/net/host/HostStoreDelegate.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/InterfaceIpAddress.java b/core/api/src/main/java/org/onosproject/net/host/InterfaceIpAddress.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/host/InterfaceIpAddress.java
rename to core/api/src/main/java/org/onosproject/net/host/InterfaceIpAddress.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/PortAddresses.java b/core/api/src/main/java/org/onosproject/net/host/PortAddresses.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/host/PortAddresses.java
rename to core/api/src/main/java/org/onosproject/net/host/PortAddresses.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/host/package-info.java b/core/api/src/main/java/org/onosproject/net/host/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/host/package-info.java
rename to core/api/src/main/java/org/onosproject/net/host/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/ConnectivityIntent.java b/core/api/src/main/java/org/onosproject/net/intent/ConnectivityIntent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/ConnectivityIntent.java
rename to core/api/src/main/java/org/onosproject/net/intent/ConnectivityIntent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/Constraint.java b/core/api/src/main/java/org/onosproject/net/intent/Constraint.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/Constraint.java
rename to core/api/src/main/java/org/onosproject/net/intent/Constraint.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/HostToHostIntent.java b/core/api/src/main/java/org/onosproject/net/intent/HostToHostIntent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/HostToHostIntent.java
rename to core/api/src/main/java/org/onosproject/net/intent/HostToHostIntent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/Intent.java b/core/api/src/main/java/org/onosproject/net/intent/Intent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/Intent.java
rename to core/api/src/main/java/org/onosproject/net/intent/Intent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentBatchDelegate.java b/core/api/src/main/java/org/onosproject/net/intent/IntentBatchDelegate.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentBatchDelegate.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentBatchDelegate.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentBatchLeaderEvent.java b/core/api/src/main/java/org/onosproject/net/intent/IntentBatchLeaderEvent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentBatchLeaderEvent.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentBatchLeaderEvent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentBatchListener.java b/core/api/src/main/java/org/onosproject/net/intent/IntentBatchListener.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentBatchListener.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentBatchListener.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentBatchService.java b/core/api/src/main/java/org/onosproject/net/intent/IntentBatchService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentBatchService.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentBatchService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentCompiler.java b/core/api/src/main/java/org/onosproject/net/intent/IntentCompiler.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentCompiler.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentCompiler.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentEvent.java b/core/api/src/main/java/org/onosproject/net/intent/IntentEvent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentEvent.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentEvent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentException.java b/core/api/src/main/java/org/onosproject/net/intent/IntentException.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentException.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentException.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentExtensionService.java b/core/api/src/main/java/org/onosproject/net/intent/IntentExtensionService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentExtensionService.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentExtensionService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentId.java b/core/api/src/main/java/org/onosproject/net/intent/IntentId.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentId.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentId.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentInstaller.java b/core/api/src/main/java/org/onosproject/net/intent/IntentInstaller.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentInstaller.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentInstaller.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentListener.java b/core/api/src/main/java/org/onosproject/net/intent/IntentListener.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentListener.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentListener.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentOperation.java b/core/api/src/main/java/org/onosproject/net/intent/IntentOperation.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentOperation.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentOperation.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentOperations.java b/core/api/src/main/java/org/onosproject/net/intent/IntentOperations.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentOperations.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentOperations.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentService.java b/core/api/src/main/java/org/onosproject/net/intent/IntentService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentService.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentState.java b/core/api/src/main/java/org/onosproject/net/intent/IntentState.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentState.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentState.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentStore.java b/core/api/src/main/java/org/onosproject/net/intent/IntentStore.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentStore.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentStore.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/intent/IntentStoreDelegate.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/IntentStoreDelegate.java
rename to core/api/src/main/java/org/onosproject/net/intent/IntentStoreDelegate.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/LinkCollectionIntent.java b/core/api/src/main/java/org/onosproject/net/intent/LinkCollectionIntent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/LinkCollectionIntent.java
rename to core/api/src/main/java/org/onosproject/net/intent/LinkCollectionIntent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/MultiPointToSinglePointIntent.java b/core/api/src/main/java/org/onosproject/net/intent/MultiPointToSinglePointIntent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/MultiPointToSinglePointIntent.java
rename to core/api/src/main/java/org/onosproject/net/intent/MultiPointToSinglePointIntent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/OpticalConnectivityIntent.java b/core/api/src/main/java/org/onosproject/net/intent/OpticalConnectivityIntent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/OpticalConnectivityIntent.java
rename to core/api/src/main/java/org/onosproject/net/intent/OpticalConnectivityIntent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/OpticalPathIntent.java b/core/api/src/main/java/org/onosproject/net/intent/OpticalPathIntent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/OpticalPathIntent.java
rename to core/api/src/main/java/org/onosproject/net/intent/OpticalPathIntent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/PathIntent.java b/core/api/src/main/java/org/onosproject/net/intent/PathIntent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/PathIntent.java
rename to core/api/src/main/java/org/onosproject/net/intent/PathIntent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/PointToPointIntent.java b/core/api/src/main/java/org/onosproject/net/intent/PointToPointIntent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/PointToPointIntent.java
rename to core/api/src/main/java/org/onosproject/net/intent/PointToPointIntent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/SinglePointToMultiPointIntent.java b/core/api/src/main/java/org/onosproject/net/intent/SinglePointToMultiPointIntent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/SinglePointToMultiPointIntent.java
rename to core/api/src/main/java/org/onosproject/net/intent/SinglePointToMultiPointIntent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/AnnotationConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/AnnotationConstraint.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/constraint/AnnotationConstraint.java
rename to core/api/src/main/java/org/onosproject/net/intent/constraint/AnnotationConstraint.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/AsymmetricPathConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/AsymmetricPathConstraint.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/constraint/AsymmetricPathConstraint.java
rename to core/api/src/main/java/org/onosproject/net/intent/constraint/AsymmetricPathConstraint.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/BandwidthConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/BandwidthConstraint.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/constraint/BandwidthConstraint.java
rename to core/api/src/main/java/org/onosproject/net/intent/constraint/BandwidthConstraint.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/BooleanConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/BooleanConstraint.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/constraint/BooleanConstraint.java
rename to core/api/src/main/java/org/onosproject/net/intent/constraint/BooleanConstraint.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/LambdaConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/LambdaConstraint.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/constraint/LambdaConstraint.java
rename to core/api/src/main/java/org/onosproject/net/intent/constraint/LambdaConstraint.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/LatencyConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/LatencyConstraint.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/constraint/LatencyConstraint.java
rename to core/api/src/main/java/org/onosproject/net/intent/constraint/LatencyConstraint.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/LinkTypeConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/LinkTypeConstraint.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/constraint/LinkTypeConstraint.java
rename to core/api/src/main/java/org/onosproject/net/intent/constraint/LinkTypeConstraint.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/ObstacleConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/ObstacleConstraint.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/constraint/ObstacleConstraint.java
rename to core/api/src/main/java/org/onosproject/net/intent/constraint/ObstacleConstraint.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/WaypointConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/WaypointConstraint.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/constraint/WaypointConstraint.java
rename to core/api/src/main/java/org/onosproject/net/intent/constraint/WaypointConstraint.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/package-info.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/constraint/package-info.java
rename to core/api/src/main/java/org/onosproject/net/intent/constraint/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/package-info.java b/core/api/src/main/java/org/onosproject/net/intent/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/intent/package-info.java
rename to core/api/src/main/java/org/onosproject/net/intent/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/link/DefaultLinkDescription.java b/core/api/src/main/java/org/onosproject/net/link/DefaultLinkDescription.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/link/DefaultLinkDescription.java
rename to core/api/src/main/java/org/onosproject/net/link/DefaultLinkDescription.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/link/LinkAdminService.java b/core/api/src/main/java/org/onosproject/net/link/LinkAdminService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/link/LinkAdminService.java
rename to core/api/src/main/java/org/onosproject/net/link/LinkAdminService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/link/LinkDescription.java b/core/api/src/main/java/org/onosproject/net/link/LinkDescription.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/link/LinkDescription.java
rename to core/api/src/main/java/org/onosproject/net/link/LinkDescription.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/link/LinkEvent.java b/core/api/src/main/java/org/onosproject/net/link/LinkEvent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/link/LinkEvent.java
rename to core/api/src/main/java/org/onosproject/net/link/LinkEvent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/link/LinkListener.java b/core/api/src/main/java/org/onosproject/net/link/LinkListener.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/link/LinkListener.java
rename to core/api/src/main/java/org/onosproject/net/link/LinkListener.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/link/LinkProvider.java b/core/api/src/main/java/org/onosproject/net/link/LinkProvider.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/link/LinkProvider.java
rename to core/api/src/main/java/org/onosproject/net/link/LinkProvider.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/link/LinkProviderRegistry.java b/core/api/src/main/java/org/onosproject/net/link/LinkProviderRegistry.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/link/LinkProviderRegistry.java
rename to core/api/src/main/java/org/onosproject/net/link/LinkProviderRegistry.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/link/LinkProviderService.java b/core/api/src/main/java/org/onosproject/net/link/LinkProviderService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/link/LinkProviderService.java
rename to core/api/src/main/java/org/onosproject/net/link/LinkProviderService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/link/LinkService.java b/core/api/src/main/java/org/onosproject/net/link/LinkService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/link/LinkService.java
rename to core/api/src/main/java/org/onosproject/net/link/LinkService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/link/LinkStore.java b/core/api/src/main/java/org/onosproject/net/link/LinkStore.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/link/LinkStore.java
rename to core/api/src/main/java/org/onosproject/net/link/LinkStore.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/link/LinkStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/link/LinkStoreDelegate.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/link/LinkStoreDelegate.java
rename to core/api/src/main/java/org/onosproject/net/link/LinkStoreDelegate.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/link/package-info.java b/core/api/src/main/java/org/onosproject/net/link/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/link/package-info.java
rename to core/api/src/main/java/org/onosproject/net/link/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/package-info.java b/core/api/src/main/java/org/onosproject/net/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/package-info.java
rename to core/api/src/main/java/org/onosproject/net/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/DefaultInboundPacket.java b/core/api/src/main/java/org/onosproject/net/packet/DefaultInboundPacket.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/packet/DefaultInboundPacket.java
rename to core/api/src/main/java/org/onosproject/net/packet/DefaultInboundPacket.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/DefaultOutboundPacket.java b/core/api/src/main/java/org/onosproject/net/packet/DefaultOutboundPacket.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/packet/DefaultOutboundPacket.java
rename to core/api/src/main/java/org/onosproject/net/packet/DefaultOutboundPacket.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/DefaultPacketContext.java b/core/api/src/main/java/org/onosproject/net/packet/DefaultPacketContext.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/packet/DefaultPacketContext.java
rename to core/api/src/main/java/org/onosproject/net/packet/DefaultPacketContext.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/InboundPacket.java b/core/api/src/main/java/org/onosproject/net/packet/InboundPacket.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/packet/InboundPacket.java
rename to core/api/src/main/java/org/onosproject/net/packet/InboundPacket.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/OutboundPacket.java b/core/api/src/main/java/org/onosproject/net/packet/OutboundPacket.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/packet/OutboundPacket.java
rename to core/api/src/main/java/org/onosproject/net/packet/OutboundPacket.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/PacketContext.java b/core/api/src/main/java/org/onosproject/net/packet/PacketContext.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/packet/PacketContext.java
rename to core/api/src/main/java/org/onosproject/net/packet/PacketContext.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/PacketEvent.java b/core/api/src/main/java/org/onosproject/net/packet/PacketEvent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/packet/PacketEvent.java
rename to core/api/src/main/java/org/onosproject/net/packet/PacketEvent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/PacketProcessor.java b/core/api/src/main/java/org/onosproject/net/packet/PacketProcessor.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/packet/PacketProcessor.java
rename to core/api/src/main/java/org/onosproject/net/packet/PacketProcessor.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/PacketProvider.java b/core/api/src/main/java/org/onosproject/net/packet/PacketProvider.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/packet/PacketProvider.java
rename to core/api/src/main/java/org/onosproject/net/packet/PacketProvider.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/PacketProviderRegistry.java b/core/api/src/main/java/org/onosproject/net/packet/PacketProviderRegistry.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/packet/PacketProviderRegistry.java
rename to core/api/src/main/java/org/onosproject/net/packet/PacketProviderRegistry.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/PacketProviderService.java b/core/api/src/main/java/org/onosproject/net/packet/PacketProviderService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/packet/PacketProviderService.java
rename to core/api/src/main/java/org/onosproject/net/packet/PacketProviderService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/PacketService.java b/core/api/src/main/java/org/onosproject/net/packet/PacketService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/packet/PacketService.java
rename to core/api/src/main/java/org/onosproject/net/packet/PacketService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/PacketStore.java b/core/api/src/main/java/org/onosproject/net/packet/PacketStore.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/packet/PacketStore.java
rename to core/api/src/main/java/org/onosproject/net/packet/PacketStore.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/PacketStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/packet/PacketStoreDelegate.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/packet/PacketStoreDelegate.java
rename to core/api/src/main/java/org/onosproject/net/packet/PacketStoreDelegate.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/package-info.java b/core/api/src/main/java/org/onosproject/net/packet/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/packet/package-info.java
rename to core/api/src/main/java/org/onosproject/net/packet/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/provider/AbstractProvider.java b/core/api/src/main/java/org/onosproject/net/provider/AbstractProvider.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/provider/AbstractProvider.java
rename to core/api/src/main/java/org/onosproject/net/provider/AbstractProvider.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderRegistry.java b/core/api/src/main/java/org/onosproject/net/provider/AbstractProviderRegistry.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderRegistry.java
rename to core/api/src/main/java/org/onosproject/net/provider/AbstractProviderRegistry.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderService.java b/core/api/src/main/java/org/onosproject/net/provider/AbstractProviderService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/provider/AbstractProviderService.java
rename to core/api/src/main/java/org/onosproject/net/provider/AbstractProviderService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/provider/Provider.java b/core/api/src/main/java/org/onosproject/net/provider/Provider.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/provider/Provider.java
rename to core/api/src/main/java/org/onosproject/net/provider/Provider.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/provider/ProviderId.java b/core/api/src/main/java/org/onosproject/net/provider/ProviderId.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/provider/ProviderId.java
rename to core/api/src/main/java/org/onosproject/net/provider/ProviderId.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/provider/ProviderRegistry.java b/core/api/src/main/java/org/onosproject/net/provider/ProviderRegistry.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/provider/ProviderRegistry.java
rename to core/api/src/main/java/org/onosproject/net/provider/ProviderRegistry.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/provider/ProviderService.java b/core/api/src/main/java/org/onosproject/net/provider/ProviderService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/provider/ProviderService.java
rename to core/api/src/main/java/org/onosproject/net/provider/ProviderService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/provider/package-info.java b/core/api/src/main/java/org/onosproject/net/provider/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/provider/package-info.java
rename to core/api/src/main/java/org/onosproject/net/provider/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/proxyarp/ProxyArpService.java b/core/api/src/main/java/org/onosproject/net/proxyarp/ProxyArpService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/proxyarp/ProxyArpService.java
rename to core/api/src/main/java/org/onosproject/net/proxyarp/ProxyArpService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/proxyarp/package-info.java b/core/api/src/main/java/org/onosproject/net/proxyarp/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/proxyarp/package-info.java
rename to core/api/src/main/java/org/onosproject/net/proxyarp/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/Bandwidth.java b/core/api/src/main/java/org/onosproject/net/resource/Bandwidth.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/Bandwidth.java
rename to core/api/src/main/java/org/onosproject/net/resource/Bandwidth.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/BandwidthResourceAllocation.java b/core/api/src/main/java/org/onosproject/net/resource/BandwidthResourceAllocation.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/BandwidthResourceAllocation.java
rename to core/api/src/main/java/org/onosproject/net/resource/BandwidthResourceAllocation.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/BandwidthResourceRequest.java b/core/api/src/main/java/org/onosproject/net/resource/BandwidthResourceRequest.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/BandwidthResourceRequest.java
rename to core/api/src/main/java/org/onosproject/net/resource/BandwidthResourceRequest.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/DefaultLinkResourceAllocations.java b/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceAllocations.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/DefaultLinkResourceAllocations.java
rename to core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceAllocations.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/DefaultLinkResourceRequest.java b/core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceRequest.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/DefaultLinkResourceRequest.java
rename to core/api/src/main/java/org/onosproject/net/resource/DefaultLinkResourceRequest.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/Lambda.java b/core/api/src/main/java/org/onosproject/net/resource/Lambda.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/Lambda.java
rename to core/api/src/main/java/org/onosproject/net/resource/Lambda.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LambdaResourceAllocation.java b/core/api/src/main/java/org/onosproject/net/resource/LambdaResourceAllocation.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/LambdaResourceAllocation.java
rename to core/api/src/main/java/org/onosproject/net/resource/LambdaResourceAllocation.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LambdaResourceRequest.java b/core/api/src/main/java/org/onosproject/net/resource/LambdaResourceRequest.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/LambdaResourceRequest.java
rename to core/api/src/main/java/org/onosproject/net/resource/LambdaResourceRequest.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResource.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResource.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/LinkResource.java
rename to core/api/src/main/java/org/onosproject/net/resource/LinkResource.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceAllocations.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceAllocations.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceAllocations.java
rename to core/api/src/main/java/org/onosproject/net/resource/LinkResourceAllocations.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceEvent.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceEvent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceEvent.java
rename to core/api/src/main/java/org/onosproject/net/resource/LinkResourceEvent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceListener.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceListener.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceListener.java
rename to core/api/src/main/java/org/onosproject/net/resource/LinkResourceListener.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceRequest.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceRequest.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceRequest.java
rename to core/api/src/main/java/org/onosproject/net/resource/LinkResourceRequest.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceService.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceService.java
rename to core/api/src/main/java/org/onosproject/net/resource/LinkResourceService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceStore.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceStore.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceStore.java
rename to core/api/src/main/java/org/onosproject/net/resource/LinkResourceStore.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResourceStoreDelegate.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/LinkResourceStoreDelegate.java
rename to core/api/src/main/java/org/onosproject/net/resource/LinkResourceStoreDelegate.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LinkResources.java b/core/api/src/main/java/org/onosproject/net/resource/LinkResources.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/LinkResources.java
rename to core/api/src/main/java/org/onosproject/net/resource/LinkResources.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/ResourceAllocation.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceAllocation.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/ResourceAllocation.java
rename to core/api/src/main/java/org/onosproject/net/resource/ResourceAllocation.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/ResourceId.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceId.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/ResourceId.java
rename to core/api/src/main/java/org/onosproject/net/resource/ResourceId.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/ResourceRequest.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceRequest.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/ResourceRequest.java
rename to core/api/src/main/java/org/onosproject/net/resource/ResourceRequest.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/ResourceType.java b/core/api/src/main/java/org/onosproject/net/resource/ResourceType.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/ResourceType.java
rename to core/api/src/main/java/org/onosproject/net/resource/ResourceType.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/package-info.java b/core/api/src/main/java/org/onosproject/net/resource/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/resource/package-info.java
rename to core/api/src/main/java/org/onosproject/net/resource/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/statistic/DefaultLoad.java b/core/api/src/main/java/org/onosproject/net/statistic/DefaultLoad.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/statistic/DefaultLoad.java
rename to core/api/src/main/java/org/onosproject/net/statistic/DefaultLoad.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/statistic/Load.java b/core/api/src/main/java/org/onosproject/net/statistic/Load.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/statistic/Load.java
rename to core/api/src/main/java/org/onosproject/net/statistic/Load.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/statistic/StatisticService.java b/core/api/src/main/java/org/onosproject/net/statistic/StatisticService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/statistic/StatisticService.java
rename to core/api/src/main/java/org/onosproject/net/statistic/StatisticService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/statistic/StatisticStore.java b/core/api/src/main/java/org/onosproject/net/statistic/StatisticStore.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/statistic/StatisticStore.java
rename to core/api/src/main/java/org/onosproject/net/statistic/StatisticStore.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/statistic/package-info.java b/core/api/src/main/java/org/onosproject/net/statistic/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/statistic/package-info.java
rename to core/api/src/main/java/org/onosproject/net/statistic/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/ClusterId.java b/core/api/src/main/java/org/onosproject/net/topology/ClusterId.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/ClusterId.java
rename to core/api/src/main/java/org/onosproject/net/topology/ClusterId.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/DefaultGraphDescription.java b/core/api/src/main/java/org/onosproject/net/topology/DefaultGraphDescription.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/DefaultGraphDescription.java
rename to core/api/src/main/java/org/onosproject/net/topology/DefaultGraphDescription.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/DefaultTopologyCluster.java b/core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyCluster.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/DefaultTopologyCluster.java
rename to core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyCluster.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/DefaultTopologyEdge.java b/core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyEdge.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/DefaultTopologyEdge.java
rename to core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyEdge.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/DefaultTopologyVertex.java b/core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyVertex.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/DefaultTopologyVertex.java
rename to core/api/src/main/java/org/onosproject/net/topology/DefaultTopologyVertex.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/GraphDescription.java b/core/api/src/main/java/org/onosproject/net/topology/GraphDescription.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/GraphDescription.java
rename to core/api/src/main/java/org/onosproject/net/topology/GraphDescription.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/LinkWeight.java b/core/api/src/main/java/org/onosproject/net/topology/LinkWeight.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/LinkWeight.java
rename to core/api/src/main/java/org/onosproject/net/topology/LinkWeight.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/PathService.java b/core/api/src/main/java/org/onosproject/net/topology/PathService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/PathService.java
rename to core/api/src/main/java/org/onosproject/net/topology/PathService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/Topology.java b/core/api/src/main/java/org/onosproject/net/topology/Topology.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/Topology.java
rename to core/api/src/main/java/org/onosproject/net/topology/Topology.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/TopologyCluster.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyCluster.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/TopologyCluster.java
rename to core/api/src/main/java/org/onosproject/net/topology/TopologyCluster.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/TopologyEdge.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyEdge.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/TopologyEdge.java
rename to core/api/src/main/java/org/onosproject/net/topology/TopologyEdge.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/TopologyEvent.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyEvent.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/TopologyEvent.java
rename to core/api/src/main/java/org/onosproject/net/topology/TopologyEvent.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/TopologyGraph.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyGraph.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/TopologyGraph.java
rename to core/api/src/main/java/org/onosproject/net/topology/TopologyGraph.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/TopologyListener.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyListener.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/TopologyListener.java
rename to core/api/src/main/java/org/onosproject/net/topology/TopologyListener.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/TopologyProvider.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyProvider.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/TopologyProvider.java
rename to core/api/src/main/java/org/onosproject/net/topology/TopologyProvider.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderRegistry.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyProviderRegistry.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderRegistry.java
rename to core/api/src/main/java/org/onosproject/net/topology/TopologyProviderRegistry.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderService.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyProviderService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/TopologyProviderService.java
rename to core/api/src/main/java/org/onosproject/net/topology/TopologyProviderService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/TopologyService.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/TopologyService.java
rename to core/api/src/main/java/org/onosproject/net/topology/TopologyService.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/TopologyStore.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyStore.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/TopologyStore.java
rename to core/api/src/main/java/org/onosproject/net/topology/TopologyStore.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/TopologyStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyStoreDelegate.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/TopologyStoreDelegate.java
rename to core/api/src/main/java/org/onosproject/net/topology/TopologyStoreDelegate.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/TopologyVertex.java b/core/api/src/main/java/org/onosproject/net/topology/TopologyVertex.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/TopologyVertex.java
rename to core/api/src/main/java/org/onosproject/net/topology/TopologyVertex.java
diff --git a/core/api/src/main/java/org/onlab/onos/net/topology/package-info.java b/core/api/src/main/java/org/onosproject/net/topology/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/net/topology/package-info.java
rename to core/api/src/main/java/org/onosproject/net/topology/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/AbstractStore.java b/core/api/src/main/java/org/onosproject/store/AbstractStore.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/AbstractStore.java
rename to core/api/src/main/java/org/onosproject/store/AbstractStore.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/Store.java b/core/api/src/main/java/org/onosproject/store/Store.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/Store.java
rename to core/api/src/main/java/org/onosproject/store/Store.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/StoreDelegate.java b/core/api/src/main/java/org/onosproject/store/StoreDelegate.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/StoreDelegate.java
rename to core/api/src/main/java/org/onosproject/store/StoreDelegate.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/Timestamp.java b/core/api/src/main/java/org/onosproject/store/Timestamp.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/Timestamp.java
rename to core/api/src/main/java/org/onosproject/store/Timestamp.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/cluster/messaging/ClusterCommunicationService.java b/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterCommunicationService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/cluster/messaging/ClusterCommunicationService.java
rename to core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterCommunicationService.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/cluster/messaging/ClusterMessage.java b/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterMessage.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/cluster/messaging/ClusterMessage.java
rename to core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterMessage.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/cluster/messaging/ClusterMessageHandler.java b/core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterMessageHandler.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/cluster/messaging/ClusterMessageHandler.java
rename to core/api/src/main/java/org/onosproject/store/cluster/messaging/ClusterMessageHandler.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/cluster/messaging/MessageSubject.java b/core/api/src/main/java/org/onosproject/store/cluster/messaging/MessageSubject.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/cluster/messaging/MessageSubject.java
rename to core/api/src/main/java/org/onosproject/store/cluster/messaging/MessageSubject.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/cluster/messaging/package-info.java b/core/api/src/main/java/org/onosproject/store/cluster/messaging/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/cluster/messaging/package-info.java
rename to core/api/src/main/java/org/onosproject/store/cluster/messaging/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/package-info.java b/core/api/src/main/java/org/onosproject/store/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/package-info.java
rename to core/api/src/main/java/org/onosproject/store/package-info.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/BatchReadRequest.java b/core/api/src/main/java/org/onosproject/store/service/BatchReadRequest.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/BatchReadRequest.java
rename to core/api/src/main/java/org/onosproject/store/service/BatchReadRequest.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/BatchReadResult.java b/core/api/src/main/java/org/onosproject/store/service/BatchReadResult.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/BatchReadResult.java
rename to core/api/src/main/java/org/onosproject/store/service/BatchReadResult.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/BatchWriteRequest.java b/core/api/src/main/java/org/onosproject/store/service/BatchWriteRequest.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/BatchWriteRequest.java
rename to core/api/src/main/java/org/onosproject/store/service/BatchWriteRequest.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/BatchWriteResult.java b/core/api/src/main/java/org/onosproject/store/service/BatchWriteResult.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/BatchWriteResult.java
rename to core/api/src/main/java/org/onosproject/store/service/BatchWriteResult.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/DatabaseAdminService.java b/core/api/src/main/java/org/onosproject/store/service/DatabaseAdminService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/DatabaseAdminService.java
rename to core/api/src/main/java/org/onosproject/store/service/DatabaseAdminService.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/DatabaseException.java b/core/api/src/main/java/org/onosproject/store/service/DatabaseException.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/DatabaseException.java
rename to core/api/src/main/java/org/onosproject/store/service/DatabaseException.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/DatabaseService.java b/core/api/src/main/java/org/onosproject/store/service/DatabaseService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/DatabaseService.java
rename to core/api/src/main/java/org/onosproject/store/service/DatabaseService.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/Lock.java b/core/api/src/main/java/org/onosproject/store/service/Lock.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/Lock.java
rename to core/api/src/main/java/org/onosproject/store/service/Lock.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/LockEventListener.java b/core/api/src/main/java/org/onosproject/store/service/LockEventListener.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/LockEventListener.java
rename to core/api/src/main/java/org/onosproject/store/service/LockEventListener.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/LockService.java b/core/api/src/main/java/org/onosproject/store/service/LockService.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/LockService.java
rename to core/api/src/main/java/org/onosproject/store/service/LockService.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/NoSuchTableException.java b/core/api/src/main/java/org/onosproject/store/service/NoSuchTableException.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/NoSuchTableException.java
rename to core/api/src/main/java/org/onosproject/store/service/NoSuchTableException.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/OptionalResult.java b/core/api/src/main/java/org/onosproject/store/service/OptionalResult.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/OptionalResult.java
rename to core/api/src/main/java/org/onosproject/store/service/OptionalResult.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/ReadRequest.java b/core/api/src/main/java/org/onosproject/store/service/ReadRequest.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/ReadRequest.java
rename to core/api/src/main/java/org/onosproject/store/service/ReadRequest.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/ReadResult.java b/core/api/src/main/java/org/onosproject/store/service/ReadResult.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/ReadResult.java
rename to core/api/src/main/java/org/onosproject/store/service/ReadResult.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/ReadStatus.java b/core/api/src/main/java/org/onosproject/store/service/ReadStatus.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/ReadStatus.java
rename to core/api/src/main/java/org/onosproject/store/service/ReadStatus.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/VersionedValue.java b/core/api/src/main/java/org/onosproject/store/service/VersionedValue.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/VersionedValue.java
rename to core/api/src/main/java/org/onosproject/store/service/VersionedValue.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/WriteRequest.java b/core/api/src/main/java/org/onosproject/store/service/WriteRequest.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/WriteRequest.java
rename to core/api/src/main/java/org/onosproject/store/service/WriteRequest.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/WriteResult.java b/core/api/src/main/java/org/onosproject/store/service/WriteResult.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/WriteResult.java
rename to core/api/src/main/java/org/onosproject/store/service/WriteResult.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/WriteStatus.java b/core/api/src/main/java/org/onosproject/store/service/WriteStatus.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/WriteStatus.java
rename to core/api/src/main/java/org/onosproject/store/service/WriteStatus.java
diff --git a/core/api/src/main/java/org/onlab/onos/store/service/package-info.java b/core/api/src/main/java/org/onosproject/store/service/package-info.java
similarity index 100%
rename from core/api/src/main/java/org/onlab/onos/store/service/package-info.java
rename to core/api/src/main/java/org/onosproject/store/service/package-info.java
diff --git a/core/api/src/main/javadoc/org/onlab/onos/net/intent/doc-files/intent-states.png b/core/api/src/main/javadoc/org/onosproject/net/intent/doc-files/intent-states.png
similarity index 100%
rename from core/api/src/main/javadoc/org/onlab/onos/net/intent/doc-files/intent-states.png
rename to core/api/src/main/javadoc/org/onosproject/net/intent/doc-files/intent-states.png
Binary files differ
diff --git a/core/api/src/test/java/org/onlab/onos/TestApplicationId.java b/core/api/src/test/java/org/onosproject/TestApplicationId.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/TestApplicationId.java
rename to core/api/src/test/java/org/onosproject/TestApplicationId.java
diff --git a/core/api/src/test/java/org/onlab/onos/VersionTest.java b/core/api/src/test/java/org/onosproject/VersionTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/VersionTest.java
rename to core/api/src/test/java/org/onosproject/VersionTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/cluster/ClusterServiceAdapter.java b/core/api/src/test/java/org/onosproject/cluster/ClusterServiceAdapter.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/cluster/ClusterServiceAdapter.java
rename to core/api/src/test/java/org/onosproject/cluster/ClusterServiceAdapter.java
diff --git a/core/api/src/test/java/org/onlab/onos/cluster/ControllerNodeToNodeIdTest.java b/core/api/src/test/java/org/onosproject/cluster/ControllerNodeToNodeIdTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/cluster/ControllerNodeToNodeIdTest.java
rename to core/api/src/test/java/org/onosproject/cluster/ControllerNodeToNodeIdTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/cluster/RoleInfoTest.java b/core/api/src/test/java/org/onosproject/cluster/RoleInfoTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/cluster/RoleInfoTest.java
rename to core/api/src/test/java/org/onosproject/cluster/RoleInfoTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/codec/JsonCodecTest.java b/core/api/src/test/java/org/onosproject/codec/JsonCodecTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/codec/JsonCodecTest.java
rename to core/api/src/test/java/org/onosproject/codec/JsonCodecTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/core/DefaultGroupIdTest.java b/core/api/src/test/java/org/onosproject/core/DefaultGroupIdTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/core/DefaultGroupIdTest.java
rename to core/api/src/test/java/org/onosproject/core/DefaultGroupIdTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/event/AbstractEventAccumulatorTest.java b/core/api/src/test/java/org/onosproject/event/AbstractEventAccumulatorTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/event/AbstractEventAccumulatorTest.java
rename to core/api/src/test/java/org/onosproject/event/AbstractEventAccumulatorTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/event/AbstractEventTest.java b/core/api/src/test/java/org/onosproject/event/AbstractEventTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/event/AbstractEventTest.java
rename to core/api/src/test/java/org/onosproject/event/AbstractEventTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/event/AbstractListenerRegistryTest.java b/core/api/src/test/java/org/onosproject/event/AbstractListenerRegistryTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/event/AbstractListenerRegistryTest.java
rename to core/api/src/test/java/org/onosproject/event/AbstractListenerRegistryTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/event/BrokenListener.java b/core/api/src/test/java/org/onosproject/event/BrokenListener.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/event/BrokenListener.java
rename to core/api/src/test/java/org/onosproject/event/BrokenListener.java
diff --git a/core/api/src/test/java/org/onlab/onos/event/DefaultEventSinkRegistryTest.java b/core/api/src/test/java/org/onosproject/event/DefaultEventSinkRegistryTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/event/DefaultEventSinkRegistryTest.java
rename to core/api/src/test/java/org/onosproject/event/DefaultEventSinkRegistryTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/event/TestEvent.java b/core/api/src/test/java/org/onosproject/event/TestEvent.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/event/TestEvent.java
rename to core/api/src/test/java/org/onosproject/event/TestEvent.java
diff --git a/core/api/src/test/java/org/onlab/onos/event/TestListener.java b/core/api/src/test/java/org/onosproject/event/TestListener.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/event/TestListener.java
rename to core/api/src/test/java/org/onosproject/event/TestListener.java
diff --git a/core/api/src/test/java/org/onlab/onos/event/TestListenerRegistry.java b/core/api/src/test/java/org/onosproject/event/TestListenerRegistry.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/event/TestListenerRegistry.java
rename to core/api/src/test/java/org/onosproject/event/TestListenerRegistry.java
diff --git a/core/api/src/test/java/org/onlab/onos/mastership/MastershipServiceAdapter.java b/core/api/src/test/java/org/onosproject/mastership/MastershipServiceAdapter.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/mastership/MastershipServiceAdapter.java
rename to core/api/src/test/java/org/onosproject/mastership/MastershipServiceAdapter.java
diff --git a/core/api/src/test/java/org/onlab/onos/mastership/MastershipTermTest.java b/core/api/src/test/java/org/onosproject/mastership/MastershipTermTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/mastership/MastershipTermTest.java
rename to core/api/src/test/java/org/onosproject/mastership/MastershipTermTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/ConnectPointTest.java b/core/api/src/test/java/org/onosproject/net/ConnectPointTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/ConnectPointTest.java
rename to core/api/src/test/java/org/onosproject/net/ConnectPointTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/DefaultAnnotationsTest.java b/core/api/src/test/java/org/onosproject/net/DefaultAnnotationsTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/DefaultAnnotationsTest.java
rename to core/api/src/test/java/org/onosproject/net/DefaultAnnotationsTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/DefaultDeviceTest.java b/core/api/src/test/java/org/onosproject/net/DefaultDeviceTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/DefaultDeviceTest.java
rename to core/api/src/test/java/org/onosproject/net/DefaultDeviceTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/DefaultEdgeLinkTest.java b/core/api/src/test/java/org/onosproject/net/DefaultEdgeLinkTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/DefaultEdgeLinkTest.java
rename to core/api/src/test/java/org/onosproject/net/DefaultEdgeLinkTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/DefaultHostTest.java b/core/api/src/test/java/org/onosproject/net/DefaultHostTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/DefaultHostTest.java
rename to core/api/src/test/java/org/onosproject/net/DefaultHostTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/DefaultLinkTest.java b/core/api/src/test/java/org/onosproject/net/DefaultLinkTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/DefaultLinkTest.java
rename to core/api/src/test/java/org/onosproject/net/DefaultLinkTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/DefaultPortTest.java b/core/api/src/test/java/org/onosproject/net/DefaultPortTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/DefaultPortTest.java
rename to core/api/src/test/java/org/onosproject/net/DefaultPortTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/DeviceIdTest.java b/core/api/src/test/java/org/onosproject/net/DeviceIdTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/DeviceIdTest.java
rename to core/api/src/test/java/org/onosproject/net/DeviceIdTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/HostIdTest.java b/core/api/src/test/java/org/onosproject/net/HostIdTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/HostIdTest.java
rename to core/api/src/test/java/org/onosproject/net/HostIdTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/LinkKeyTest.java b/core/api/src/test/java/org/onosproject/net/LinkKeyTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/LinkKeyTest.java
rename to core/api/src/test/java/org/onosproject/net/LinkKeyTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/NetTestTools.java b/core/api/src/test/java/org/onosproject/net/NetTestTools.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/NetTestTools.java
rename to core/api/src/test/java/org/onosproject/net/NetTestTools.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/PortNumberTest.java b/core/api/src/test/java/org/onosproject/net/PortNumberTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/PortNumberTest.java
rename to core/api/src/test/java/org/onosproject/net/PortNumberTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/TestDeviceParams.java b/core/api/src/test/java/org/onosproject/net/TestDeviceParams.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/TestDeviceParams.java
rename to core/api/src/test/java/org/onosproject/net/TestDeviceParams.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/device/DefaultDeviceDescriptionTest.java b/core/api/src/test/java/org/onosproject/net/device/DefaultDeviceDescriptionTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/device/DefaultDeviceDescriptionTest.java
rename to core/api/src/test/java/org/onosproject/net/device/DefaultDeviceDescriptionTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/device/DeviceEventTest.java b/core/api/src/test/java/org/onosproject/net/device/DeviceEventTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/device/DeviceEventTest.java
rename to core/api/src/test/java/org/onosproject/net/device/DeviceEventTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/device/DeviceServiceAdapter.java b/core/api/src/test/java/org/onosproject/net/device/DeviceServiceAdapter.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/device/DeviceServiceAdapter.java
rename to core/api/src/test/java/org/onosproject/net/device/DeviceServiceAdapter.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/flow/BatchOperationTest.java b/core/api/src/test/java/org/onosproject/net/flow/BatchOperationTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/flow/BatchOperationTest.java
rename to core/api/src/test/java/org/onosproject/net/flow/BatchOperationTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/flow/DefaultFlowEntryTest.java b/core/api/src/test/java/org/onosproject/net/flow/DefaultFlowEntryTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/flow/DefaultFlowEntryTest.java
rename to core/api/src/test/java/org/onosproject/net/flow/DefaultFlowEntryTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/flow/DefaultFlowRuleTest.java b/core/api/src/test/java/org/onosproject/net/flow/DefaultFlowRuleTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/flow/DefaultFlowRuleTest.java
rename to core/api/src/test/java/org/onosproject/net/flow/DefaultFlowRuleTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/flow/DefaultTrafficSelectorTest.java b/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficSelectorTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/flow/DefaultTrafficSelectorTest.java
rename to core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficSelectorTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/flow/DefaultTrafficTreatmentTest.java b/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficTreatmentTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/flow/DefaultTrafficTreatmentTest.java
rename to core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficTreatmentTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/flow/FlowIdTest.java b/core/api/src/test/java/org/onosproject/net/flow/FlowIdTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/flow/FlowIdTest.java
rename to core/api/src/test/java/org/onosproject/net/flow/FlowIdTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/flow/FlowRuleBatchOperationTest.java b/core/api/src/test/java/org/onosproject/net/flow/FlowRuleBatchOperationTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/flow/FlowRuleBatchOperationTest.java
rename to core/api/src/test/java/org/onosproject/net/flow/FlowRuleBatchOperationTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/flow/FlowRuleBatchRequestTest.java b/core/api/src/test/java/org/onosproject/net/flow/FlowRuleBatchRequestTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/flow/FlowRuleBatchRequestTest.java
rename to core/api/src/test/java/org/onosproject/net/flow/FlowRuleBatchRequestTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/flow/FlowRuleEventTest.java b/core/api/src/test/java/org/onosproject/net/flow/FlowRuleEventTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/flow/FlowRuleEventTest.java
rename to core/api/src/test/java/org/onosproject/net/flow/FlowRuleEventTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/flow/criteria/CriteriaTest.java b/core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/flow/criteria/CriteriaTest.java
rename to core/api/src/test/java/org/onosproject/net/flow/criteria/CriteriaTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/flow/instructions/InstructionsTest.java b/core/api/src/test/java/org/onosproject/net/flow/instructions/InstructionsTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/flow/instructions/InstructionsTest.java
rename to core/api/src/test/java/org/onosproject/net/flow/instructions/InstructionsTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/host/DefaultHostDecriptionTest.java b/core/api/src/test/java/org/onosproject/net/host/DefaultHostDecriptionTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/host/DefaultHostDecriptionTest.java
rename to core/api/src/test/java/org/onosproject/net/host/DefaultHostDecriptionTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/host/HostEventTest.java b/core/api/src/test/java/org/onosproject/net/host/HostEventTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/host/HostEventTest.java
rename to core/api/src/test/java/org/onosproject/net/host/HostEventTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/host/HostServiceAdapter.java b/core/api/src/test/java/org/onosproject/net/host/HostServiceAdapter.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/host/HostServiceAdapter.java
rename to core/api/src/test/java/org/onosproject/net/host/HostServiceAdapter.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/host/InterfaceIpAddressTest.java b/core/api/src/test/java/org/onosproject/net/host/InterfaceIpAddressTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/host/InterfaceIpAddressTest.java
rename to core/api/src/test/java/org/onosproject/net/host/InterfaceIpAddressTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/AbstractIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/AbstractIntentTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/AbstractIntentTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/AbstractIntentTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/ConnectivityIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/ConnectivityIntentTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/ConnectivityIntentTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/ConnectivityIntentTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/FakeIntentManager.java b/core/api/src/test/java/org/onosproject/net/intent/FakeIntentManager.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/FakeIntentManager.java
rename to core/api/src/test/java/org/onosproject/net/intent/FakeIntentManager.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/HostToHostIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/HostToHostIntentTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/HostToHostIntentTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/HostToHostIntentTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/IntentExceptionTest.java b/core/api/src/test/java/org/onosproject/net/intent/IntentExceptionTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/IntentExceptionTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/IntentExceptionTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/IntentIdTest.java b/core/api/src/test/java/org/onosproject/net/intent/IntentIdTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/IntentIdTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/IntentIdTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/IntentOperationsTest.java b/core/api/src/test/java/org/onosproject/net/intent/IntentOperationsTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/IntentOperationsTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/IntentOperationsTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/IntentServiceTest.java b/core/api/src/test/java/org/onosproject/net/intent/IntentServiceTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/IntentServiceTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/IntentServiceTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/IntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/IntentTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/IntentTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/IntentTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/IntentTestsMocks.java b/core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/IntentTestsMocks.java
rename to core/api/src/test/java/org/onosproject/net/intent/IntentTestsMocks.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/LinkCollectionIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/LinkCollectionIntentTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/LinkCollectionIntentTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/LinkCollectionIntentTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/MockIdGenerator.java b/core/api/src/test/java/org/onosproject/net/intent/MockIdGenerator.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/MockIdGenerator.java
rename to core/api/src/test/java/org/onosproject/net/intent/MockIdGenerator.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/MultiPointToSinglePointIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/MultiPointToSinglePointIntentTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/MultiPointToSinglePointIntentTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/MultiPointToSinglePointIntentTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/PathIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/PathIntentTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/PathIntentTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/PathIntentTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/PointToPointIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/PointToPointIntentTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/PointToPointIntentTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/PointToPointIntentTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/SinglePointToMultiPointIntentTest.java b/core/api/src/test/java/org/onosproject/net/intent/SinglePointToMultiPointIntentTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/SinglePointToMultiPointIntentTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/SinglePointToMultiPointIntentTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/TestInstallableIntent.java b/core/api/src/test/java/org/onosproject/net/intent/TestInstallableIntent.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/TestInstallableIntent.java
rename to core/api/src/test/java/org/onosproject/net/intent/TestInstallableIntent.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/TestIntent.java b/core/api/src/test/java/org/onosproject/net/intent/TestIntent.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/TestIntent.java
rename to core/api/src/test/java/org/onosproject/net/intent/TestIntent.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/TestSubclassInstallableIntent.java b/core/api/src/test/java/org/onosproject/net/intent/TestSubclassInstallableIntent.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/TestSubclassInstallableIntent.java
rename to core/api/src/test/java/org/onosproject/net/intent/TestSubclassInstallableIntent.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/TestSubclassIntent.java b/core/api/src/test/java/org/onosproject/net/intent/TestSubclassIntent.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/TestSubclassIntent.java
rename to core/api/src/test/java/org/onosproject/net/intent/TestSubclassIntent.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/TestTools.java b/core/api/src/test/java/org/onosproject/net/intent/TestTools.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/TestTools.java
rename to core/api/src/test/java/org/onosproject/net/intent/TestTools.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/TestableIntentService.java b/core/api/src/test/java/org/onosproject/net/intent/TestableIntentService.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/TestableIntentService.java
rename to core/api/src/test/java/org/onosproject/net/intent/TestableIntentService.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/constraint/AnnotationConstraintTest.java b/core/api/src/test/java/org/onosproject/net/intent/constraint/AnnotationConstraintTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/constraint/AnnotationConstraintTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/constraint/AnnotationConstraintTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/constraint/ConstraintObjectsTest.java b/core/api/src/test/java/org/onosproject/net/intent/constraint/ConstraintObjectsTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/constraint/ConstraintObjectsTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/constraint/ConstraintObjectsTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/constraint/LatencyConstraintTest.java b/core/api/src/test/java/org/onosproject/net/intent/constraint/LatencyConstraintTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/constraint/LatencyConstraintTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/constraint/LatencyConstraintTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/constraint/ObstacleConstraintTest.java b/core/api/src/test/java/org/onosproject/net/intent/constraint/ObstacleConstraintTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/constraint/ObstacleConstraintTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/constraint/ObstacleConstraintTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/constraint/WaypointConstraintTest.java b/core/api/src/test/java/org/onosproject/net/intent/constraint/WaypointConstraintTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/intent/constraint/WaypointConstraintTest.java
rename to core/api/src/test/java/org/onosproject/net/intent/constraint/WaypointConstraintTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/link/DefaultLinkDescriptionTest.java b/core/api/src/test/java/org/onosproject/net/link/DefaultLinkDescriptionTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/link/DefaultLinkDescriptionTest.java
rename to core/api/src/test/java/org/onosproject/net/link/DefaultLinkDescriptionTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/link/LinkEventTest.java b/core/api/src/test/java/org/onosproject/net/link/LinkEventTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/link/LinkEventTest.java
rename to core/api/src/test/java/org/onosproject/net/link/LinkEventTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/link/LinkServiceAdapter.java b/core/api/src/test/java/org/onosproject/net/link/LinkServiceAdapter.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/link/LinkServiceAdapter.java
rename to core/api/src/test/java/org/onosproject/net/link/LinkServiceAdapter.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/packet/DefaultInboundPacketTest.java b/core/api/src/test/java/org/onosproject/net/packet/DefaultInboundPacketTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/packet/DefaultInboundPacketTest.java
rename to core/api/src/test/java/org/onosproject/net/packet/DefaultInboundPacketTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/packet/DefaultOutboundPacketTest.java b/core/api/src/test/java/org/onosproject/net/packet/DefaultOutboundPacketTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/packet/DefaultOutboundPacketTest.java
rename to core/api/src/test/java/org/onosproject/net/packet/DefaultOutboundPacketTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/packet/DefaultPacketContextTest.java b/core/api/src/test/java/org/onosproject/net/packet/DefaultPacketContextTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/packet/DefaultPacketContextTest.java
rename to core/api/src/test/java/org/onosproject/net/packet/DefaultPacketContextTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/provider/AbstractProviderRegistryTest.java b/core/api/src/test/java/org/onosproject/net/provider/AbstractProviderRegistryTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/provider/AbstractProviderRegistryTest.java
rename to core/api/src/test/java/org/onosproject/net/provider/AbstractProviderRegistryTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/provider/AbstractProviderTest.java b/core/api/src/test/java/org/onosproject/net/provider/AbstractProviderTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/provider/AbstractProviderTest.java
rename to core/api/src/test/java/org/onosproject/net/provider/AbstractProviderTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/provider/ProviderIdTest.java b/core/api/src/test/java/org/onosproject/net/provider/ProviderIdTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/provider/ProviderIdTest.java
rename to core/api/src/test/java/org/onosproject/net/provider/ProviderIdTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/provider/TestProvider.java b/core/api/src/test/java/org/onosproject/net/provider/TestProvider.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/provider/TestProvider.java
rename to core/api/src/test/java/org/onosproject/net/provider/TestProvider.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/topology/ClusterIdTest.java b/core/api/src/test/java/org/onosproject/net/topology/ClusterIdTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/topology/ClusterIdTest.java
rename to core/api/src/test/java/org/onosproject/net/topology/ClusterIdTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/topology/DefaultGraphDescriptionTest.java b/core/api/src/test/java/org/onosproject/net/topology/DefaultGraphDescriptionTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/topology/DefaultGraphDescriptionTest.java
rename to core/api/src/test/java/org/onosproject/net/topology/DefaultGraphDescriptionTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/topology/DefaultTopologyClusterTest.java b/core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyClusterTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/topology/DefaultTopologyClusterTest.java
rename to core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyClusterTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/topology/DefaultTopologyEdgeTest.java b/core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyEdgeTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/topology/DefaultTopologyEdgeTest.java
rename to core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyEdgeTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/topology/DefaultTopologyVertexTest.java b/core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyVertexTest.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/topology/DefaultTopologyVertexTest.java
rename to core/api/src/test/java/org/onosproject/net/topology/DefaultTopologyVertexTest.java
diff --git a/core/api/src/test/java/org/onlab/onos/net/topology/TopologyServiceAdapter.java b/core/api/src/test/java/org/onosproject/net/topology/TopologyServiceAdapter.java
similarity index 100%
rename from core/api/src/test/java/org/onlab/onos/net/topology/TopologyServiceAdapter.java
rename to core/api/src/test/java/org/onosproject/net/topology/TopologyServiceAdapter.java
diff --git a/core/json/src/main/java/org/onlab/onos/json/impl/DeleteMe.java b/core/json/src/main/java/org/onosproject/json/impl/DeleteMe.java
similarity index 100%
rename from core/json/src/main/java/org/onlab/onos/json/impl/DeleteMe.java
rename to core/json/src/main/java/org/onosproject/json/impl/DeleteMe.java
diff --git a/core/json/src/main/java/org/onlab/onos/json/impl/package-info.java b/core/json/src/main/java/org/onosproject/json/impl/package-info.java
similarity index 100%
rename from core/json/src/main/java/org/onlab/onos/json/impl/package-info.java
rename to core/json/src/main/java/org/onosproject/json/impl/package-info.java
diff --git a/core/net/src/main/java/org/onlab/onos/cluster/impl/ClusterManager.java b/core/net/src/main/java/org/onosproject/cluster/impl/ClusterManager.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/cluster/impl/ClusterManager.java
rename to core/net/src/main/java/org/onosproject/cluster/impl/ClusterManager.java
diff --git a/core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java b/core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/cluster/impl/MastershipManager.java
rename to core/net/src/main/java/org/onosproject/cluster/impl/MastershipManager.java
diff --git a/core/net/src/main/java/org/onlab/onos/cluster/impl/package-info.java b/core/net/src/main/java/org/onosproject/cluster/impl/package-info.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/cluster/impl/package-info.java
rename to core/net/src/main/java/org/onosproject/cluster/impl/package-info.java
diff --git a/core/net/src/main/java/org/onlab/onos/core/impl/BlockAllocatorBasedIdGenerator.java b/core/net/src/main/java/org/onosproject/core/impl/BlockAllocatorBasedIdGenerator.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/core/impl/BlockAllocatorBasedIdGenerator.java
rename to core/net/src/main/java/org/onosproject/core/impl/BlockAllocatorBasedIdGenerator.java
diff --git a/core/net/src/main/java/org/onlab/onos/core/impl/CoreManager.java b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/core/impl/CoreManager.java
rename to core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
diff --git a/core/net/src/main/java/org/onlab/onos/core/impl/IdBlockAllocator.java b/core/net/src/main/java/org/onosproject/core/impl/IdBlockAllocator.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/core/impl/IdBlockAllocator.java
rename to core/net/src/main/java/org/onosproject/core/impl/IdBlockAllocator.java
diff --git a/core/net/src/main/java/org/onlab/onos/core/impl/MetricsManagerComponent.java b/core/net/src/main/java/org/onosproject/core/impl/MetricsManagerComponent.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/core/impl/MetricsManagerComponent.java
rename to core/net/src/main/java/org/onosproject/core/impl/MetricsManagerComponent.java
diff --git a/core/net/src/main/java/org/onlab/onos/core/impl/StoreBasedIdBlockAllocator.java b/core/net/src/main/java/org/onosproject/core/impl/StoreBasedIdBlockAllocator.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/core/impl/StoreBasedIdBlockAllocator.java
rename to core/net/src/main/java/org/onosproject/core/impl/StoreBasedIdBlockAllocator.java
diff --git a/core/net/src/main/java/org/onlab/onos/core/impl/package-info.java b/core/net/src/main/java/org/onosproject/core/impl/package-info.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/core/impl/package-info.java
rename to core/net/src/main/java/org/onosproject/core/impl/package-info.java
diff --git a/core/net/src/main/java/org/onlab/onos/event/impl/CoreEventDispatcher.java b/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/event/impl/CoreEventDispatcher.java
rename to core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
diff --git a/core/net/src/main/java/org/onlab/onos/event/impl/package-info.java b/core/net/src/main/java/org/onosproject/event/impl/package-info.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/event/impl/package-info.java
rename to core/net/src/main/java/org/onosproject/event/impl/package-info.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java
rename to core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/device/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/device/impl/package-info.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/device/impl/package-info.java
rename to core/net/src/main/java/org/onosproject/net/device/impl/package-info.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
rename to core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/flow/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/flow/impl/package-info.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/flow/impl/package-info.java
rename to core/net/src/main/java/org/onosproject/net/flow/impl/package-info.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/host/impl/HostManager.java b/core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/host/impl/HostManager.java
rename to core/net/src/main/java/org/onosproject/net/host/impl/HostManager.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/host/impl/HostMonitor.java b/core/net/src/main/java/org/onosproject/net/host/impl/HostMonitor.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/host/impl/HostMonitor.java
rename to core/net/src/main/java/org/onosproject/net/host/impl/HostMonitor.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/host/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/host/impl/package-info.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/host/impl/package-info.java
rename to core/net/src/main/java/org/onosproject/net/host/impl/package-info.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/ConnectivityIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/ConnectivityIntentCompiler.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/ConnectivityIntentCompiler.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/ConnectivityIntentCompiler.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/HostToHostIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/HostToHostIntentCompiler.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/HostToHostIntentCompiler.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/HostToHostIntentCompiler.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentCompilationException.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentCompilationException.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentCompilationException.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/IntentCompilationException.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentInstallationException.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentInstallationException.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentInstallationException.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/IntentInstallationException.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentRemovalException.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentRemovalException.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentRemovalException.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/IntentRemovalException.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/LinkCollectionIntentInstaller.java b/core/net/src/main/java/org/onosproject/net/intent/impl/LinkCollectionIntentInstaller.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/LinkCollectionIntentInstaller.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/LinkCollectionIntentInstaller.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/MultiPointToSinglePointIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/MultiPointToSinglePointIntentCompiler.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/MultiPointToSinglePointIntentCompiler.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/MultiPointToSinglePointIntentCompiler.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/ObjectiveTracker.java b/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTracker.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/ObjectiveTracker.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTracker.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/ObjectiveTrackerService.java b/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTrackerService.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/ObjectiveTrackerService.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTrackerService.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalConnectivityIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/OpticalConnectivityIntentCompiler.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalConnectivityIntentCompiler.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/OpticalConnectivityIntentCompiler.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalPathIntentInstaller.java b/core/net/src/main/java/org/onosproject/net/intent/impl/OpticalPathIntentInstaller.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalPathIntentInstaller.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/OpticalPathIntentInstaller.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java b/core/net/src/main/java/org/onosproject/net/intent/impl/PathIntentInstaller.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/PathIntentInstaller.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathNotFoundException.java b/core/net/src/main/java/org/onosproject/net/intent/impl/PathNotFoundException.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/PathNotFoundException.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/PathNotFoundException.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/PointToPointIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/PointToPointIntentCompiler.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/PointToPointIntentCompiler.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/PointToPointIntentCompiler.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/SinglePointToMultiPointIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/SinglePointToMultiPointIntentCompiler.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/SinglePointToMultiPointIntentCompiler.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/SinglePointToMultiPointIntentCompiler.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/TopologyChangeDelegate.java b/core/net/src/main/java/org/onosproject/net/intent/impl/TopologyChangeDelegate.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/TopologyChangeDelegate.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/TopologyChangeDelegate.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/intent/impl/package-info.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/intent/impl/package-info.java
rename to core/net/src/main/java/org/onosproject/net/intent/impl/package-info.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/link/impl/LinkManager.java b/core/net/src/main/java/org/onosproject/net/link/impl/LinkManager.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/link/impl/LinkManager.java
rename to core/net/src/main/java/org/onosproject/net/link/impl/LinkManager.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/link/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/link/impl/package-info.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/link/impl/package-info.java
rename to core/net/src/main/java/org/onosproject/net/link/impl/package-info.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/packet/impl/PacketManager.java b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/packet/impl/PacketManager.java
rename to core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/packet/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/packet/impl/package-info.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/packet/impl/package-info.java
rename to core/net/src/main/java/org/onosproject/net/packet/impl/package-info.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/proxyarp/impl/ProxyArpManager.java b/core/net/src/main/java/org/onosproject/net/proxyarp/impl/ProxyArpManager.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/proxyarp/impl/ProxyArpManager.java
rename to core/net/src/main/java/org/onosproject/net/proxyarp/impl/ProxyArpManager.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/proxyarp/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/proxyarp/impl/package-info.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/proxyarp/impl/package-info.java
rename to core/net/src/main/java/org/onosproject/net/proxyarp/impl/package-info.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/resource/impl/LinkResourceManager.java b/core/net/src/main/java/org/onosproject/net/resource/impl/LinkResourceManager.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/resource/impl/LinkResourceManager.java
rename to core/net/src/main/java/org/onosproject/net/resource/impl/LinkResourceManager.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/resource/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/resource/impl/package-info.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/resource/impl/package-info.java
rename to core/net/src/main/java/org/onosproject/net/resource/impl/package-info.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/statistic/impl/StatisticManager.java b/core/net/src/main/java/org/onosproject/net/statistic/impl/StatisticManager.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/statistic/impl/StatisticManager.java
rename to core/net/src/main/java/org/onosproject/net/statistic/impl/StatisticManager.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/statistic/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/statistic/impl/package-info.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/statistic/impl/package-info.java
rename to core/net/src/main/java/org/onosproject/net/statistic/impl/package-info.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/topology/impl/DefaultTopologyProvider.java b/core/net/src/main/java/org/onosproject/net/topology/impl/DefaultTopologyProvider.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/topology/impl/DefaultTopologyProvider.java
rename to core/net/src/main/java/org/onosproject/net/topology/impl/DefaultTopologyProvider.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/topology/impl/PathManager.java b/core/net/src/main/java/org/onosproject/net/topology/impl/PathManager.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/topology/impl/PathManager.java
rename to core/net/src/main/java/org/onosproject/net/topology/impl/PathManager.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/topology/impl/TopologyManager.java b/core/net/src/main/java/org/onosproject/net/topology/impl/TopologyManager.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/topology/impl/TopologyManager.java
rename to core/net/src/main/java/org/onosproject/net/topology/impl/TopologyManager.java
diff --git a/core/net/src/main/java/org/onlab/onos/net/topology/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/topology/impl/package-info.java
similarity index 100%
rename from core/net/src/main/java/org/onlab/onos/net/topology/impl/package-info.java
rename to core/net/src/main/java/org/onosproject/net/topology/impl/package-info.java
diff --git a/core/net/src/test/java/org/onlab/onos/cluster/impl/MastershipManagerTest.java b/core/net/src/test/java/org/onosproject/cluster/impl/MastershipManagerTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/cluster/impl/MastershipManagerTest.java
rename to core/net/src/test/java/org/onosproject/cluster/impl/MastershipManagerTest.java
diff --git a/core/net/src/test/java/org/onlab/onos/core/impl/DummyIdBlockAllocator.java b/core/net/src/test/java/org/onosproject/core/impl/DummyIdBlockAllocator.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/core/impl/DummyIdBlockAllocator.java
rename to core/net/src/test/java/org/onosproject/core/impl/DummyIdBlockAllocator.java
diff --git a/core/net/src/test/java/org/onlab/onos/core/impl/IdBlockAllocatorBasedIdGeneratorTest.java b/core/net/src/test/java/org/onosproject/core/impl/IdBlockAllocatorBasedIdGeneratorTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/core/impl/IdBlockAllocatorBasedIdGeneratorTest.java
rename to core/net/src/test/java/org/onosproject/core/impl/IdBlockAllocatorBasedIdGeneratorTest.java
diff --git a/core/net/src/test/java/org/onlab/onos/core/impl/TestCoreManager.java b/core/net/src/test/java/org/onosproject/core/impl/TestCoreManager.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/core/impl/TestCoreManager.java
rename to core/net/src/test/java/org/onosproject/core/impl/TestCoreManager.java
diff --git a/core/net/src/test/java/org/onlab/onos/event/impl/CoreEventDispatcherTest.java b/core/net/src/test/java/org/onosproject/event/impl/CoreEventDispatcherTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/event/impl/CoreEventDispatcherTest.java
rename to core/net/src/test/java/org/onosproject/event/impl/CoreEventDispatcherTest.java
diff --git a/core/net/src/test/java/org/onlab/onos/event/impl/TestEventDispatcher.java b/core/net/src/test/java/org/onosproject/event/impl/TestEventDispatcher.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/event/impl/TestEventDispatcher.java
rename to core/net/src/test/java/org/onosproject/event/impl/TestEventDispatcher.java
diff --git a/core/net/src/test/java/org/onlab/onos/net/device/impl/DeviceManagerTest.java b/core/net/src/test/java/org/onosproject/net/device/impl/DeviceManagerTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/net/device/impl/DeviceManagerTest.java
rename to core/net/src/test/java/org/onosproject/net/device/impl/DeviceManagerTest.java
diff --git a/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java b/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java
rename to core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
diff --git a/core/net/src/test/java/org/onlab/onos/net/host/impl/HostManagerTest.java b/core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/net/host/impl/HostManagerTest.java
rename to core/net/src/test/java/org/onosproject/net/host/impl/HostManagerTest.java
diff --git a/core/net/src/test/java/org/onlab/onos/net/host/impl/HostMonitorTest.java b/core/net/src/test/java/org/onosproject/net/host/impl/HostMonitorTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/net/host/impl/HostMonitorTest.java
rename to core/net/src/test/java/org/onosproject/net/host/impl/HostMonitorTest.java
diff --git a/core/net/src/test/java/org/onlab/onos/net/intent/LinksHaveEntryWithSourceDestinationPairMatcher.java b/core/net/src/test/java/org/onosproject/net/intent/LinksHaveEntryWithSourceDestinationPairMatcher.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/net/intent/LinksHaveEntryWithSourceDestinationPairMatcher.java
rename to core/net/src/test/java/org/onosproject/net/intent/LinksHaveEntryWithSourceDestinationPairMatcher.java
diff --git a/core/net/src/test/java/org/onlab/onos/net/intent/impl/HostToHostIntentCompilerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/HostToHostIntentCompilerTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/net/intent/impl/HostToHostIntentCompilerTest.java
rename to core/net/src/test/java/org/onosproject/net/intent/impl/HostToHostIntentCompilerTest.java
diff --git a/core/net/src/test/java/org/onlab/onos/net/intent/impl/IntentManagerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/net/intent/impl/IntentManagerTest.java
rename to core/net/src/test/java/org/onosproject/net/intent/impl/IntentManagerTest.java
diff --git a/core/net/src/test/java/org/onlab/onos/net/intent/impl/MockFlowRuleService.java b/core/net/src/test/java/org/onosproject/net/intent/impl/MockFlowRuleService.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/net/intent/impl/MockFlowRuleService.java
rename to core/net/src/test/java/org/onosproject/net/intent/impl/MockFlowRuleService.java
diff --git a/core/net/src/test/java/org/onlab/onos/net/intent/impl/MultiPointToSinglePointIntentCompilerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/MultiPointToSinglePointIntentCompilerTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/net/intent/impl/MultiPointToSinglePointIntentCompilerTest.java
rename to core/net/src/test/java/org/onosproject/net/intent/impl/MultiPointToSinglePointIntentCompilerTest.java
diff --git a/core/net/src/test/java/org/onlab/onos/net/intent/impl/PathConstraintCalculationTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/net/intent/impl/PathConstraintCalculationTest.java
rename to core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java
diff --git a/core/net/src/test/java/org/onlab/onos/net/intent/impl/PointToPointIntentCompilerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/PointToPointIntentCompilerTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/net/intent/impl/PointToPointIntentCompilerTest.java
rename to core/net/src/test/java/org/onosproject/net/intent/impl/PointToPointIntentCompilerTest.java
diff --git a/core/net/src/test/java/org/onlab/onos/net/link/impl/LinkManagerTest.java b/core/net/src/test/java/org/onosproject/net/link/impl/LinkManagerTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/net/link/impl/LinkManagerTest.java
rename to core/net/src/test/java/org/onosproject/net/link/impl/LinkManagerTest.java
diff --git a/core/net/src/test/java/org/onlab/onos/net/proxyarp/impl/ProxyArpManagerTest.java b/core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/net/proxyarp/impl/ProxyArpManagerTest.java
rename to core/net/src/test/java/org/onosproject/net/proxyarp/impl/ProxyArpManagerTest.java
diff --git a/core/net/src/test/java/org/onlab/onos/net/topology/impl/DefaultTopologyProviderTest.java b/core/net/src/test/java/org/onosproject/net/topology/impl/DefaultTopologyProviderTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/net/topology/impl/DefaultTopologyProviderTest.java
rename to core/net/src/test/java/org/onosproject/net/topology/impl/DefaultTopologyProviderTest.java
diff --git a/core/net/src/test/java/org/onlab/onos/net/topology/impl/PathManagerTest.java b/core/net/src/test/java/org/onosproject/net/topology/impl/PathManagerTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/net/topology/impl/PathManagerTest.java
rename to core/net/src/test/java/org/onosproject/net/topology/impl/PathManagerTest.java
diff --git a/core/net/src/test/java/org/onlab/onos/net/topology/impl/TopologyManagerTest.java b/core/net/src/test/java/org/onosproject/net/topology/impl/TopologyManagerTest.java
similarity index 100%
rename from core/net/src/test/java/org/onlab/onos/net/topology/impl/TopologyManagerTest.java
rename to core/net/src/test/java/org/onosproject/net/topology/impl/TopologyManagerTest.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/ClusterDefinitionStore.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterDefinitionStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/ClusterDefinitionStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterDefinitionStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/ClusterManagementMessageSubjects.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterManagementMessageSubjects.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/ClusterManagementMessageSubjects.java
rename to core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterManagementMessageSubjects.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/ClusterMembershipEvent.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterMembershipEvent.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/ClusterMembershipEvent.java
rename to core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterMembershipEvent.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/ClusterMembershipEventType.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterMembershipEventType.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/ClusterMembershipEventType.java
rename to core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterMembershipEventType.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/ClusterNodesDelegate.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterNodesDelegate.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/ClusterNodesDelegate.java
rename to core/store/dist/src/main/java/org/onosproject/store/cluster/impl/ClusterNodesDelegate.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/DistributedClusterStore.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/DistributedClusterStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/cluster/impl/DistributedClusterStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/HazelcastLeadershipService.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/HazelcastLeadershipService.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/HazelcastLeadershipService.java
rename to core/store/dist/src/main/java/org/onosproject/store/cluster/impl/HazelcastLeadershipService.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/LeadershipManager.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/LeadershipManager.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/LeadershipManager.java
rename to core/store/dist/src/main/java/org/onosproject/store/cluster/impl/LeadershipManager.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/impl/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/cluster/impl/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/ClusterCommunicationManager.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManager.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/ClusterCommunicationManager.java
rename to core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManager.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/cluster/messaging/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/cluster/messaging/impl/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/core/impl/AppIdEvent.java b/core/store/dist/src/main/java/org/onosproject/store/core/impl/AppIdEvent.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/core/impl/AppIdEvent.java
rename to core/store/dist/src/main/java/org/onosproject/store/core/impl/AppIdEvent.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/core/impl/AppIdStoreDelegate.java b/core/store/dist/src/main/java/org/onosproject/store/core/impl/AppIdStoreDelegate.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/core/impl/AppIdStoreDelegate.java
rename to core/store/dist/src/main/java/org/onosproject/store/core/impl/AppIdStoreDelegate.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/core/impl/DistributedApplicationIdStore.java b/core/store/dist/src/main/java/org/onosproject/store/core/impl/DistributedApplicationIdStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/core/impl/DistributedApplicationIdStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/core/impl/DistributedApplicationIdStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/core/impl/DistributedIdBlockStore.java b/core/store/dist/src/main/java/org/onosproject/store/core/impl/DistributedIdBlockStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/core/impl/DistributedIdBlockStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/core/impl/DistributedIdBlockStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/core/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/core/impl/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/core/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/core/impl/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceAntiEntropyAdvertisement.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceAntiEntropyAdvertisement.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceAntiEntropyAdvertisement.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceAntiEntropyAdvertisement.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceAntiEntropyRequest.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceAntiEntropyRequest.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceAntiEntropyRequest.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceAntiEntropyRequest.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceClockManager.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceClockManager.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceClockManager.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceClockManager.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceDescriptions.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceDescriptions.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceDescriptions.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceDescriptions.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceFragmentId.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceFragmentId.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/DeviceFragmentId.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/DeviceFragmentId.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/GossipDeviceStore.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/GossipDeviceStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/GossipDeviceStoreMessageSubjects.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStoreMessageSubjects.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/GossipDeviceStoreMessageSubjects.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/GossipDeviceStoreMessageSubjects.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalDeviceEvent.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceEvent.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalDeviceEvent.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceEvent.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalDeviceEventSerializer.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceEventSerializer.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalDeviceEventSerializer.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceEventSerializer.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalDeviceOfflineEvent.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceOfflineEvent.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalDeviceOfflineEvent.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceOfflineEvent.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalDeviceOfflineEventSerializer.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceOfflineEventSerializer.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalDeviceOfflineEventSerializer.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceOfflineEventSerializer.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalDeviceRemovedEvent.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceRemovedEvent.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalDeviceRemovedEvent.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalDeviceRemovedEvent.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalPortEvent.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortEvent.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalPortEvent.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortEvent.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalPortEventSerializer.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortEventSerializer.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalPortEventSerializer.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortEventSerializer.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalPortStatusEvent.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortStatusEvent.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalPortStatusEvent.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortStatusEvent.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalPortStatusEventSerializer.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortStatusEventSerializer.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/InternalPortStatusEventSerializer.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/InternalPortStatusEventSerializer.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/PortFragmentId.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/PortFragmentId.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/PortFragmentId.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/PortFragmentId.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/device/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/device/impl/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/device/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/device/impl/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/flow/ReplicaInfo.java b/core/store/dist/src/main/java/org/onosproject/store/flow/ReplicaInfo.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/flow/ReplicaInfo.java
rename to core/store/dist/src/main/java/org/onosproject/store/flow/ReplicaInfo.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/flow/ReplicaInfoEvent.java b/core/store/dist/src/main/java/org/onosproject/store/flow/ReplicaInfoEvent.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/flow/ReplicaInfoEvent.java
rename to core/store/dist/src/main/java/org/onosproject/store/flow/ReplicaInfoEvent.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/flow/ReplicaInfoEventListener.java b/core/store/dist/src/main/java/org/onosproject/store/flow/ReplicaInfoEventListener.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/flow/ReplicaInfoEventListener.java
rename to core/store/dist/src/main/java/org/onosproject/store/flow/ReplicaInfoEventListener.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/flow/ReplicaInfoService.java b/core/store/dist/src/main/java/org/onosproject/store/flow/ReplicaInfoService.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/flow/ReplicaInfoService.java
rename to core/store/dist/src/main/java/org/onosproject/store/flow/ReplicaInfoService.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/flow/impl/DistributedFlowRuleStore.java b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/flow/impl/DistributedFlowRuleStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/flow/impl/DistributedFlowRuleStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/flow/impl/FlowStoreMessageSubjects.java b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/FlowStoreMessageSubjects.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/flow/impl/FlowStoreMessageSubjects.java
rename to core/store/dist/src/main/java/org/onosproject/store/flow/impl/FlowStoreMessageSubjects.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/flow/impl/ReplicaInfoManager.java b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/ReplicaInfoManager.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/flow/impl/ReplicaInfoManager.java
rename to core/store/dist/src/main/java/org/onosproject/store/flow/impl/ReplicaInfoManager.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/flow/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/flow/impl/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/flow/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/flow/impl/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/flow/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/flow/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/flow/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/flow/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/host/impl/GossipHostStore.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/GossipHostStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/host/impl/GossipHostStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/host/impl/GossipHostStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/host/impl/GossipHostStoreMessageSubjects.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/GossipHostStoreMessageSubjects.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/host/impl/GossipHostStoreMessageSubjects.java
rename to core/store/dist/src/main/java/org/onosproject/store/host/impl/GossipHostStoreMessageSubjects.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/host/impl/HostAntiEntropyAdvertisement.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/HostAntiEntropyAdvertisement.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/host/impl/HostAntiEntropyAdvertisement.java
rename to core/store/dist/src/main/java/org/onosproject/store/host/impl/HostAntiEntropyAdvertisement.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/host/impl/HostClockManager.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/HostClockManager.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/host/impl/HostClockManager.java
rename to core/store/dist/src/main/java/org/onosproject/store/host/impl/HostClockManager.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/host/impl/HostFragmentId.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/HostFragmentId.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/host/impl/HostFragmentId.java
rename to core/store/dist/src/main/java/org/onosproject/store/host/impl/HostFragmentId.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/host/impl/InternalHostEvent.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/InternalHostEvent.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/host/impl/InternalHostEvent.java
rename to core/store/dist/src/main/java/org/onosproject/store/host/impl/InternalHostEvent.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/host/impl/InternalHostRemovedEvent.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/InternalHostRemovedEvent.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/host/impl/InternalHostRemovedEvent.java
rename to core/store/dist/src/main/java/org/onosproject/store/host/impl/InternalHostRemovedEvent.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/host/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/host/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/host/impl/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/hz/AbsentInvalidatingLoadingCache.java b/core/store/dist/src/main/java/org/onosproject/store/hz/AbsentInvalidatingLoadingCache.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/hz/AbsentInvalidatingLoadingCache.java
rename to core/store/dist/src/main/java/org/onosproject/store/hz/AbsentInvalidatingLoadingCache.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/hz/AbstractHazelcastStore.java b/core/store/dist/src/main/java/org/onosproject/store/hz/AbstractHazelcastStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/hz/AbstractHazelcastStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/hz/AbstractHazelcastStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/hz/OptionalCacheLoader.java b/core/store/dist/src/main/java/org/onosproject/store/hz/OptionalCacheLoader.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/hz/OptionalCacheLoader.java
rename to core/store/dist/src/main/java/org/onosproject/store/hz/OptionalCacheLoader.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/hz/SMap.java b/core/store/dist/src/main/java/org/onosproject/store/hz/SMap.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/hz/SMap.java
rename to core/store/dist/src/main/java/org/onosproject/store/hz/SMap.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/hz/SQueue.java b/core/store/dist/src/main/java/org/onosproject/store/hz/SQueue.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/hz/SQueue.java
rename to core/store/dist/src/main/java/org/onosproject/store/hz/SQueue.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/hz/STxMap.java b/core/store/dist/src/main/java/org/onosproject/store/hz/STxMap.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/hz/STxMap.java
rename to core/store/dist/src/main/java/org/onosproject/store/hz/STxMap.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/hz/StoreManager.java b/core/store/dist/src/main/java/org/onosproject/store/hz/StoreManager.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/hz/StoreManager.java
rename to core/store/dist/src/main/java/org/onosproject/store/hz/StoreManager.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/hz/StoreService.java b/core/store/dist/src/main/java/org/onosproject/store/hz/StoreService.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/hz/StoreService.java
rename to core/store/dist/src/main/java/org/onosproject/store/hz/StoreService.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/hz/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/hz/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/hz/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/hz/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/impl/MastershipBasedTimestamp.java b/core/store/dist/src/main/java/org/onosproject/store/impl/MastershipBasedTimestamp.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/impl/MastershipBasedTimestamp.java
rename to core/store/dist/src/main/java/org/onosproject/store/impl/MastershipBasedTimestamp.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/impl/Timestamped.java b/core/store/dist/src/main/java/org/onosproject/store/impl/Timestamped.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/impl/Timestamped.java
rename to core/store/dist/src/main/java/org/onosproject/store/impl/Timestamped.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/impl/WallClockTimestamp.java b/core/store/dist/src/main/java/org/onosproject/store/impl/WallClockTimestamp.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/impl/WallClockTimestamp.java
rename to core/store/dist/src/main/java/org/onosproject/store/impl/WallClockTimestamp.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/impl/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/impl/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/DistributedIntentStore.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/DistributedIntentStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/DistributedIntentStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/intent/impl/DistributedIntentStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentBatchQueue.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/HazelcastIntentBatchQueue.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentBatchQueue.java
rename to core/store/dist/src/main/java/org/onosproject/store/intent/impl/HazelcastIntentBatchQueue.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentStore.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/HazelcastIntentStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/HazelcastIntentStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/intent/impl/HazelcastIntentStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/intent/impl/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/intent/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/intent/impl/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/link/impl/GossipLinkStore.java b/core/store/dist/src/main/java/org/onosproject/store/link/impl/GossipLinkStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/link/impl/GossipLinkStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/link/impl/GossipLinkStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/link/impl/GossipLinkStoreMessageSubjects.java b/core/store/dist/src/main/java/org/onosproject/store/link/impl/GossipLinkStoreMessageSubjects.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/link/impl/GossipLinkStoreMessageSubjects.java
rename to core/store/dist/src/main/java/org/onosproject/store/link/impl/GossipLinkStoreMessageSubjects.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/link/impl/InternalLinkEvent.java b/core/store/dist/src/main/java/org/onosproject/store/link/impl/InternalLinkEvent.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/link/impl/InternalLinkEvent.java
rename to core/store/dist/src/main/java/org/onosproject/store/link/impl/InternalLinkEvent.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/link/impl/InternalLinkRemovedEvent.java b/core/store/dist/src/main/java/org/onosproject/store/link/impl/InternalLinkRemovedEvent.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/link/impl/InternalLinkRemovedEvent.java
rename to core/store/dist/src/main/java/org/onosproject/store/link/impl/InternalLinkRemovedEvent.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/link/impl/LinkAntiEntropyAdvertisement.java b/core/store/dist/src/main/java/org/onosproject/store/link/impl/LinkAntiEntropyAdvertisement.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/link/impl/LinkAntiEntropyAdvertisement.java
rename to core/store/dist/src/main/java/org/onosproject/store/link/impl/LinkAntiEntropyAdvertisement.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/link/impl/LinkFragmentId.java b/core/store/dist/src/main/java/org/onosproject/store/link/impl/LinkFragmentId.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/link/impl/LinkFragmentId.java
rename to core/store/dist/src/main/java/org/onosproject/store/link/impl/LinkFragmentId.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/link/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/link/impl/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/link/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/link/impl/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/mastership/impl/DistributedMastershipStore.java b/core/store/dist/src/main/java/org/onosproject/store/mastership/impl/DistributedMastershipStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/mastership/impl/DistributedMastershipStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/mastership/impl/DistributedMastershipStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/mastership/impl/RoleValue.java b/core/store/dist/src/main/java/org/onosproject/store/mastership/impl/RoleValue.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/mastership/impl/RoleValue.java
rename to core/store/dist/src/main/java/org/onosproject/store/mastership/impl/RoleValue.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/mastership/impl/RoleValueSerializer.java b/core/store/dist/src/main/java/org/onosproject/store/mastership/impl/RoleValueSerializer.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/mastership/impl/RoleValueSerializer.java
rename to core/store/dist/src/main/java/org/onosproject/store/mastership/impl/RoleValueSerializer.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/mastership/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/mastership/impl/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/mastership/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/mastership/impl/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/packet/impl/DistributedPacketStore.java b/core/store/dist/src/main/java/org/onosproject/store/packet/impl/DistributedPacketStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/packet/impl/DistributedPacketStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/packet/impl/DistributedPacketStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/packet/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/packet/impl/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/packet/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/packet/impl/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/resource/impl/DistributedLinkResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/DistributedLinkResourceStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/resource/impl/DistributedLinkResourceStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/resource/impl/DistributedLinkResourceStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/resource/impl/HazelcastLinkResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/HazelcastLinkResourceStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/resource/impl/HazelcastLinkResourceStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/resource/impl/HazelcastLinkResourceStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/resource/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/resource/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/resource/impl/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/serializers/impl/ClusterMessageSerializer.java b/core/store/dist/src/main/java/org/onosproject/store/serializers/impl/ClusterMessageSerializer.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/serializers/impl/ClusterMessageSerializer.java
rename to core/store/dist/src/main/java/org/onosproject/store/serializers/impl/ClusterMessageSerializer.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/serializers/impl/DistributedStoreSerializers.java b/core/store/dist/src/main/java/org/onosproject/store/serializers/impl/DistributedStoreSerializers.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/serializers/impl/DistributedStoreSerializers.java
rename to core/store/dist/src/main/java/org/onosproject/store/serializers/impl/DistributedStoreSerializers.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/serializers/impl/MastershipBasedTimestampSerializer.java b/core/store/dist/src/main/java/org/onosproject/store/serializers/impl/MastershipBasedTimestampSerializer.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/serializers/impl/MastershipBasedTimestampSerializer.java
rename to core/store/dist/src/main/java/org/onosproject/store/serializers/impl/MastershipBasedTimestampSerializer.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/serializers/impl/MessageSubjectSerializer.java b/core/store/dist/src/main/java/org/onosproject/store/serializers/impl/MessageSubjectSerializer.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/serializers/impl/MessageSubjectSerializer.java
rename to core/store/dist/src/main/java/org/onosproject/store/serializers/impl/MessageSubjectSerializer.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/serializers/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/serializers/impl/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/serializers/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/serializers/impl/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/CMap.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/CMap.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/CMap.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/CMap.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/ClusterMessagingProtocol.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/ClusterMessagingProtocol.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/ClusterMessagingProtocol.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/ClusterMessagingProtocol.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/ClusterMessagingProtocolClient.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/ClusterMessagingProtocolClient.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/ClusterMessagingProtocolClient.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/ClusterMessagingProtocolClient.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/ClusterMessagingProtocolServer.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/ClusterMessagingProtocolServer.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/ClusterMessagingProtocolServer.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/ClusterMessagingProtocolServer.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseClient.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseClient.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseClient.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseClient.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseEntryExpirationTracker.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseEntryExpirationTracker.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseEntryExpirationTracker.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseEntryExpirationTracker.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseManager.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseManager.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseManager.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseManager.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseProtocolService.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseProtocolService.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseProtocolService.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseProtocolService.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseStateMachine.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseStateMachine.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseStateMachine.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseStateMachine.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseUpdateEventListener.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseUpdateEventListener.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseUpdateEventListener.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/DatabaseUpdateEventListener.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DistributedLock.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/DistributedLock.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DistributedLock.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/DistributedLock.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DistributedLockManager.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/DistributedLockManager.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DistributedLockManager.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/DistributedLockManager.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/MapDBLog.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/MapDBLog.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/MapDBLog.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/MapDBLog.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/SnapshotException.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/SnapshotException.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/SnapshotException.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/SnapshotException.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/TableModificationEvent.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/TableModificationEvent.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/TableModificationEvent.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/TableModificationEvent.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/TabletDefinitionStore.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/TabletDefinitionStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/TabletDefinitionStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/TabletDefinitionStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/TcpClusterConfigSerializer.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/TcpClusterConfigSerializer.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/TcpClusterConfigSerializer.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/TcpClusterConfigSerializer.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/TcpMemberSerializer.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/TcpMemberSerializer.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/TcpMemberSerializer.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/TcpMemberSerializer.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/service/impl/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/service/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/service/impl/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/statistic/impl/DistributedStatisticStore.java b/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedStatisticStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/statistic/impl/DistributedStatisticStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/statistic/impl/DistributedStatisticStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/statistic/impl/StatisticStoreMessageSubjects.java b/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/StatisticStoreMessageSubjects.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/statistic/impl/StatisticStoreMessageSubjects.java
rename to core/store/dist/src/main/java/org/onosproject/store/statistic/impl/StatisticStoreMessageSubjects.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/statistic/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/statistic/impl/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/statistic/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/statistic/impl/package-info.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/topology/impl/DefaultTopology.java b/core/store/dist/src/main/java/org/onosproject/store/topology/impl/DefaultTopology.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/topology/impl/DefaultTopology.java
rename to core/store/dist/src/main/java/org/onosproject/store/topology/impl/DefaultTopology.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/topology/impl/DefaultTopologyGraph.java b/core/store/dist/src/main/java/org/onosproject/store/topology/impl/DefaultTopologyGraph.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/topology/impl/DefaultTopologyGraph.java
rename to core/store/dist/src/main/java/org/onosproject/store/topology/impl/DefaultTopologyGraph.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/topology/impl/DistributedTopologyStore.java b/core/store/dist/src/main/java/org/onosproject/store/topology/impl/DistributedTopologyStore.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/topology/impl/DistributedTopologyStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/topology/impl/DistributedTopologyStore.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/topology/impl/PathKey.java b/core/store/dist/src/main/java/org/onosproject/store/topology/impl/PathKey.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/topology/impl/PathKey.java
rename to core/store/dist/src/main/java/org/onosproject/store/topology/impl/PathKey.java
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/topology/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/topology/impl/package-info.java
similarity index 100%
rename from core/store/dist/src/main/java/org/onlab/onos/store/topology/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/topology/impl/package-info.java
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/cluster/StaticClusterService.java b/core/store/dist/src/test/java/org/onosproject/store/cluster/StaticClusterService.java
similarity index 100%
rename from core/store/dist/src/test/java/org/onlab/onos/store/cluster/StaticClusterService.java
rename to core/store/dist/src/test/java/org/onosproject/store/cluster/StaticClusterService.java
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/cluster/messaging/impl/ClusterCommunicationManagerTest.java b/core/store/dist/src/test/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManagerTest.java
similarity index 100%
rename from core/store/dist/src/test/java/org/onlab/onos/store/cluster/messaging/impl/ClusterCommunicationManagerTest.java
rename to core/store/dist/src/test/java/org/onosproject/store/cluster/messaging/impl/ClusterCommunicationManagerTest.java
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/device/impl/DeviceFragmentIdTest.java b/core/store/dist/src/test/java/org/onosproject/store/device/impl/DeviceFragmentIdTest.java
similarity index 100%
rename from core/store/dist/src/test/java/org/onlab/onos/store/device/impl/DeviceFragmentIdTest.java
rename to core/store/dist/src/test/java/org/onosproject/store/device/impl/DeviceFragmentIdTest.java
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/device/impl/GossipDeviceStoreTest.java b/core/store/dist/src/test/java/org/onosproject/store/device/impl/GossipDeviceStoreTest.java
similarity index 100%
rename from core/store/dist/src/test/java/org/onlab/onos/store/device/impl/GossipDeviceStoreTest.java
rename to core/store/dist/src/test/java/org/onosproject/store/device/impl/GossipDeviceStoreTest.java
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/device/impl/PortFragmentIdTest.java b/core/store/dist/src/test/java/org/onosproject/store/device/impl/PortFragmentIdTest.java
similarity index 100%
rename from core/store/dist/src/test/java/org/onlab/onos/store/device/impl/PortFragmentIdTest.java
rename to core/store/dist/src/test/java/org/onosproject/store/device/impl/PortFragmentIdTest.java
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/flow/impl/ReplicaInfoManagerTest.java b/core/store/dist/src/test/java/org/onosproject/store/flow/impl/ReplicaInfoManagerTest.java
similarity index 100%
rename from core/store/dist/src/test/java/org/onlab/onos/store/flow/impl/ReplicaInfoManagerTest.java
rename to core/store/dist/src/test/java/org/onosproject/store/flow/impl/ReplicaInfoManagerTest.java
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/hz/TestStoreManager.java b/core/store/dist/src/test/java/org/onosproject/store/hz/TestStoreManager.java
similarity index 100%
rename from core/store/dist/src/test/java/org/onlab/onos/store/hz/TestStoreManager.java
rename to core/store/dist/src/test/java/org/onosproject/store/hz/TestStoreManager.java
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/impl/MastershipBasedTimestampTest.java b/core/store/dist/src/test/java/org/onosproject/store/impl/MastershipBasedTimestampTest.java
similarity index 100%
rename from core/store/dist/src/test/java/org/onlab/onos/store/impl/MastershipBasedTimestampTest.java
rename to core/store/dist/src/test/java/org/onosproject/store/impl/MastershipBasedTimestampTest.java
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/impl/TimestampedTest.java b/core/store/dist/src/test/java/org/onosproject/store/impl/TimestampedTest.java
similarity index 100%
rename from core/store/dist/src/test/java/org/onlab/onos/store/impl/TimestampedTest.java
rename to core/store/dist/src/test/java/org/onosproject/store/impl/TimestampedTest.java
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/impl/WallClockTimestampTest.java b/core/store/dist/src/test/java/org/onosproject/store/impl/WallClockTimestampTest.java
similarity index 100%
rename from core/store/dist/src/test/java/org/onlab/onos/store/impl/WallClockTimestampTest.java
rename to core/store/dist/src/test/java/org/onosproject/store/impl/WallClockTimestampTest.java
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/link/impl/GossipLinkStoreTest.java b/core/store/dist/src/test/java/org/onosproject/store/link/impl/GossipLinkStoreTest.java
similarity index 100%
rename from core/store/dist/src/test/java/org/onlab/onos/store/link/impl/GossipLinkStoreTest.java
rename to core/store/dist/src/test/java/org/onosproject/store/link/impl/GossipLinkStoreTest.java
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/link/impl/LinkFragmentIdTest.java b/core/store/dist/src/test/java/org/onosproject/store/link/impl/LinkFragmentIdTest.java
similarity index 100%
rename from core/store/dist/src/test/java/org/onlab/onos/store/link/impl/LinkFragmentIdTest.java
rename to core/store/dist/src/test/java/org/onosproject/store/link/impl/LinkFragmentIdTest.java
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/mastership/impl/DistributedMastershipStoreTest.java b/core/store/dist/src/test/java/org/onosproject/store/mastership/impl/DistributedMastershipStoreTest.java
similarity index 100%
rename from core/store/dist/src/test/java/org/onlab/onos/store/mastership/impl/DistributedMastershipStoreTest.java
rename to core/store/dist/src/test/java/org/onosproject/store/mastership/impl/DistributedMastershipStoreTest.java
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/mastership/impl/RoleValueTest.java b/core/store/dist/src/test/java/org/onosproject/store/mastership/impl/RoleValueTest.java
similarity index 100%
rename from core/store/dist/src/test/java/org/onlab/onos/store/mastership/impl/RoleValueTest.java
rename to core/store/dist/src/test/java/org/onosproject/store/mastership/impl/RoleValueTest.java
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/resource/impl/HazelcastLinkResourceStoreTest.java b/core/store/dist/src/test/java/org/onosproject/store/resource/impl/HazelcastLinkResourceStoreTest.java
similarity index 100%
rename from core/store/dist/src/test/java/org/onlab/onos/store/resource/impl/HazelcastLinkResourceStoreTest.java
rename to core/store/dist/src/test/java/org/onosproject/store/resource/impl/HazelcastLinkResourceStoreTest.java
diff --git a/core/store/dist/src/test/java/org/onlab/onos/store/service/impl/MapDBLogTest.java b/core/store/dist/src/test/java/org/onosproject/store/service/impl/MapDBLogTest.java
similarity index 100%
rename from core/store/dist/src/test/java/org/onlab/onos/store/service/impl/MapDBLogTest.java
rename to core/store/dist/src/test/java/org/onosproject/store/service/impl/MapDBLogTest.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/ArraysAsListSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/ArraysAsListSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/ArraysAsListSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/ArraysAsListSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/ConnectPointSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/ConnectPointSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/ConnectPointSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/ConnectPointSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/DecodeTo.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/DecodeTo.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/DecodeTo.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/DecodeTo.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/DefaultApplicationIdSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/DefaultApplicationIdSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/DefaultApplicationIdSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/DefaultApplicationIdSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/DefaultLinkSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/DefaultLinkSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/DefaultLinkSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/DefaultLinkSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/DefaultOutboundPacketSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/DefaultOutboundPacketSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/DefaultOutboundPacketSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/DefaultOutboundPacketSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/DefaultPortSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/DefaultPortSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/DefaultPortSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/DefaultPortSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/DeviceIdSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/DeviceIdSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/DeviceIdSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/DeviceIdSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/HostLocationSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/HostLocationSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/HostLocationSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/HostLocationSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/ImmutableListSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/ImmutableListSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/ImmutableListSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/ImmutableListSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/ImmutableMapSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/ImmutableMapSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/ImmutableMapSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/ImmutableMapSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/ImmutableSetSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/ImmutableSetSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/ImmutableSetSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/ImmutableSetSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/Ip4AddressSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/Ip4AddressSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/Ip4AddressSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/Ip4AddressSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/Ip4PrefixSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/Ip4PrefixSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/Ip4PrefixSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/Ip4PrefixSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/Ip6AddressSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/Ip6AddressSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/Ip6AddressSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/Ip6AddressSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/Ip6PrefixSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/Ip6PrefixSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/Ip6PrefixSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/Ip6PrefixSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/IpAddressSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/IpAddressSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/IpAddressSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/IpAddressSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/IpPrefixSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/IpPrefixSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/IpPrefixSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/IpPrefixSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/KryoNamespaces.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/KryoNamespaces.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/KryoSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/KryoSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/LinkKeySerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/LinkKeySerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/LinkKeySerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/LinkKeySerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/MacAddressSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/MacAddressSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/MacAddressSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/MacAddressSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/MastershipTermSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/MastershipTermSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/MastershipTermSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/MastershipTermSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/NodeIdSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/NodeIdSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/NodeIdSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/NodeIdSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/PortNumberSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/PortNumberSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/PortNumberSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/PortNumberSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/ProviderIdSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/ProviderIdSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/ProviderIdSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/ProviderIdSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/StoreSerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/StoreSerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/StoreSerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/StoreSerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/URISerializer.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/URISerializer.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/URISerializer.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/URISerializer.java
diff --git a/core/store/serializers/src/main/java/org/onlab/onos/store/serializers/package-info.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/package-info.java
similarity index 100%
rename from core/store/serializers/src/main/java/org/onlab/onos/store/serializers/package-info.java
rename to core/store/serializers/src/main/java/org/onosproject/store/serializers/package-info.java
diff --git a/core/store/serializers/src/test/java/org/onlab/onos/store/serializers/KryoSerializerTest.java b/core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
similarity index 100%
rename from core/store/serializers/src/test/java/org/onlab/onos/store/serializers/KryoSerializerTest.java
rename to core/store/serializers/src/test/java/org/onosproject/store/serializers/KryoSerializerTest.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/DefaultTopology.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/DefaultTopology.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/DefaultTopology.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/DefaultTopology.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/DefaultTopologyGraph.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/DefaultTopologyGraph.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/DefaultTopologyGraph.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/DefaultTopologyGraph.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/NoOpClockProviderService.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/NoOpClockProviderService.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/NoOpClockProviderService.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/NoOpClockProviderService.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/PathKey.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/PathKey.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/PathKey.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/PathKey.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleApplicationIdStore.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleApplicationIdStore.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleApplicationIdStore.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleApplicationIdStore.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleClusterStore.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleClusterStore.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleClusterStore.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleClusterStore.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleDeviceStore.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleDeviceStore.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleDeviceStore.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleDeviceStore.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleFlowRuleStore.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleFlowRuleStore.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleFlowRuleStore.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleFlowRuleStore.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleHostStore.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleHostStore.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleHostStore.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleHostStore.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIdBlockStore.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIdBlockStore.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIdBlockStore.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIdBlockStore.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIntentBatchQueue.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIntentBatchQueue.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIntentBatchQueue.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIntentBatchQueue.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIntentStore.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIntentStore.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleIntentStore.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleIntentStore.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleLeadershipManager.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLeadershipManager.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleLeadershipManager.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLeadershipManager.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleLinkResourceStore.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLinkResourceStore.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleLinkResourceStore.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLinkResourceStore.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleLinkStore.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLinkStore.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleLinkStore.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleLinkStore.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleMastershipStore.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleMastershipStore.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleMastershipStore.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleMastershipStore.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimplePacketStore.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimplePacketStore.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimplePacketStore.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimplePacketStore.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleStatisticStore.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleStatisticStore.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleStatisticStore.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleStatisticStore.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleTopologyStore.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleTopologyStore.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/SimpleTopologyStore.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/SimpleTopologyStore.java
diff --git a/core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/package-info.java b/core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/package-info.java
similarity index 100%
rename from core/store/trivial/src/main/java/org/onlab/onos/store/trivial/impl/package-info.java
rename to core/store/trivial/src/main/java/org/onosproject/store/trivial/impl/package-info.java
diff --git a/core/store/trivial/src/test/java/org/onlab/onos/store/trivial/impl/DefaultTopologyTest.java b/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/DefaultTopologyTest.java
similarity index 100%
rename from core/store/trivial/src/test/java/org/onlab/onos/store/trivial/impl/DefaultTopologyTest.java
rename to core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/DefaultTopologyTest.java
diff --git a/core/store/trivial/src/test/java/org/onlab/onos/store/trivial/impl/SimpleDeviceStoreTest.java b/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleDeviceStoreTest.java
similarity index 100%
rename from core/store/trivial/src/test/java/org/onlab/onos/store/trivial/impl/SimpleDeviceStoreTest.java
rename to core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleDeviceStoreTest.java
diff --git a/core/store/trivial/src/test/java/org/onlab/onos/store/trivial/impl/SimpleLinkResourceStoreTest.java b/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleLinkResourceStoreTest.java
similarity index 100%
rename from core/store/trivial/src/test/java/org/onlab/onos/store/trivial/impl/SimpleLinkResourceStoreTest.java
rename to core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleLinkResourceStoreTest.java
diff --git a/core/store/trivial/src/test/java/org/onlab/onos/store/trivial/impl/SimpleLinkStoreTest.java b/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleLinkStoreTest.java
similarity index 100%
rename from core/store/trivial/src/test/java/org/onlab/onos/store/trivial/impl/SimpleLinkStoreTest.java
rename to core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleLinkStoreTest.java
diff --git a/core/store/trivial/src/test/java/org/onlab/onos/store/trivial/impl/SimpleMastershipStoreTest.java b/core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleMastershipStoreTest.java
similarity index 100%
rename from core/store/trivial/src/test/java/org/onlab/onos/store/trivial/impl/SimpleMastershipStoreTest.java
rename to core/store/trivial/src/test/java/org/onosproject/store/trivial/impl/SimpleMastershipStoreTest.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/DefaultOpenFlowPacketContext.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/DefaultOpenFlowPacketContext.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/DefaultOpenFlowPacketContext.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/DefaultOpenFlowPacketContext.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/Dpid.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/Dpid.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/Dpid.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/Dpid.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowController.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowController.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowController.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowController.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowEventListener.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowEventListener.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowEventListener.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowEventListener.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowPacketContext.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowPacketContext.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowPacketContext.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowSwitch.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitch.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowSwitch.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitch.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowSwitchListener.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitchListener.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/OpenFlowSwitchListener.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/OpenFlowSwitchListener.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/PacketListener.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/PacketListener.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/PacketListener.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/PacketListener.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/RoleState.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/RoleState.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/RoleState.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/RoleState.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/AbstractOpenFlowSwitch.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/AbstractOpenFlowSwitch.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/driver/AbstractOpenFlowSwitch.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/OpenFlowAgent.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowAgent.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/OpenFlowAgent.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowAgent.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/OpenFlowSwitchDriver.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriver.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/OpenFlowSwitchDriver.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriver.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/OpenFlowSwitchDriverFactory.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriverFactory.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/OpenFlowSwitchDriverFactory.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/driver/OpenFlowSwitchDriverFactory.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/RoleHandler.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleHandler.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/RoleHandler.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleHandler.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/RoleRecvStatus.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleRecvStatus.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/RoleRecvStatus.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleRecvStatus.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/RoleReplyInfo.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleReplyInfo.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/RoleReplyInfo.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/driver/RoleReplyInfo.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeAlreadyStarted.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeCompleted.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeCompleted.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeCompleted.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeCompleted.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeException.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeException.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeException.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeException.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeNotStarted.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeNotStarted.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeNotStarted.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeNotStarted.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeStateException.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeStateException.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchDriverSubHandshakeStateException.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchDriverSubHandshakeStateException.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchStateException.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchStateException.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/SwitchStateException.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/driver/SwitchStateException.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/package-info.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/driver/package-info.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/driver/package-info.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/driver/package-info.java
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/package-info.java b/openflow/api/src/main/java/org/onosproject/openflow/controller/package-info.java
similarity index 100%
rename from openflow/api/src/main/java/org/onlab/onos/openflow/controller/package-info.java
rename to openflow/api/src/main/java/org/onosproject/openflow/controller/package-info.java
diff --git a/openflow/api/src/test/java/org/onlab/onos/openflow/controller/OpenflowControllerAdapter.java b/openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java
similarity index 100%
rename from openflow/api/src/test/java/org/onlab/onos/openflow/controller/OpenflowControllerAdapter.java
rename to openflow/api/src/test/java/org/onosproject/openflow/controller/OpenflowControllerAdapter.java
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/Controller.java b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/Controller.java
rename to openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/HandshakeTimeoutException.java b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/HandshakeTimeoutException.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/HandshakeTimeoutException.java
rename to openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/HandshakeTimeoutException.java
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/HandshakeTimeoutHandler.java b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/HandshakeTimeoutHandler.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/HandshakeTimeoutHandler.java
rename to openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/HandshakeTimeoutHandler.java
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/OFChannelHandler.java b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/OFChannelHandler.java
rename to openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFChannelHandler.java
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/OFMessageDecoder.java b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageDecoder.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/OFMessageDecoder.java
rename to openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageDecoder.java
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/OFMessageEncoder.java b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageEncoder.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/OFMessageEncoder.java
rename to openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OFMessageEncoder.java
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/OpenFlowControllerImpl.java b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/OpenFlowControllerImpl.java
rename to openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/OpenflowPipelineFactory.java b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenflowPipelineFactory.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/OpenflowPipelineFactory.java
rename to openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenflowPipelineFactory.java
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/RoleManager.java b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/RoleManager.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/RoleManager.java
rename to openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/RoleManager.java
diff --git a/openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/package-info.java b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/package-info.java
similarity index 100%
rename from openflow/ctl/src/main/java/org/onlab/onos/openflow/controller/impl/package-info.java
rename to openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/package-info.java
diff --git a/openflow/ctl/src/test/java/org/onlab/onos/openflow/controller/impl/RoleManagerTest.java b/openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/RoleManagerTest.java
similarity index 100%
rename from openflow/ctl/src/test/java/org/onlab/onos/openflow/controller/impl/RoleManagerTest.java
rename to openflow/ctl/src/test/java/org/onosproject/openflow/controller/impl/RoleManagerTest.java
diff --git a/openflow/drivers/src/main/java/org/onlab/onos/openflow/drivers/DriverManager.java b/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/DriverManager.java
similarity index 100%
rename from openflow/drivers/src/main/java/org/onlab/onos/openflow/drivers/DriverManager.java
rename to openflow/drivers/src/main/java/org/onosproject/openflow/drivers/DriverManager.java
diff --git a/openflow/drivers/src/main/java/org/onlab/onos/openflow/drivers/OFOpticalSwitchImplLINC13.java b/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFOpticalSwitchImplLINC13.java
similarity index 100%
rename from openflow/drivers/src/main/java/org/onlab/onos/openflow/drivers/OFOpticalSwitchImplLINC13.java
rename to openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFOpticalSwitchImplLINC13.java
diff --git a/openflow/drivers/src/main/java/org/onlab/onos/openflow/drivers/OFSwitchImplCPqD13.java b/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplCPqD13.java
similarity index 100%
rename from openflow/drivers/src/main/java/org/onlab/onos/openflow/drivers/OFSwitchImplCPqD13.java
rename to openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplCPqD13.java
diff --git a/openflow/drivers/src/main/java/org/onlab/onos/openflow/drivers/OFSwitchImplOVS10.java b/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplOVS10.java
similarity index 100%
rename from openflow/drivers/src/main/java/org/onlab/onos/openflow/drivers/OFSwitchImplOVS10.java
rename to openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplOVS10.java
diff --git a/openflow/drivers/src/main/java/org/onlab/onos/openflow/drivers/OFSwitchImplOVS13.java b/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplOVS13.java
similarity index 100%
rename from openflow/drivers/src/main/java/org/onlab/onos/openflow/drivers/OFSwitchImplOVS13.java
rename to openflow/drivers/src/main/java/org/onosproject/openflow/drivers/OFSwitchImplOVS13.java
diff --git a/openflow/drivers/src/main/java/org/onlab/onos/openflow/drivers/package-info.java b/openflow/drivers/src/main/java/org/onosproject/openflow/drivers/package-info.java
similarity index 100%
rename from openflow/drivers/src/main/java/org/onlab/onos/openflow/drivers/package-info.java
rename to openflow/drivers/src/main/java/org/onosproject/openflow/drivers/package-info.java
diff --git a/providers/host/src/main/java/org/onlab/onos/provider/host/impl/HostLocationProvider.java b/providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
similarity index 100%
rename from providers/host/src/main/java/org/onlab/onos/provider/host/impl/HostLocationProvider.java
rename to providers/host/src/main/java/org/onosproject/provider/host/impl/HostLocationProvider.java
diff --git a/providers/host/src/main/java/org/onlab/onos/provider/host/impl/package-info.java b/providers/host/src/main/java/org/onosproject/provider/host/impl/package-info.java
similarity index 100%
rename from providers/host/src/main/java/org/onlab/onos/provider/host/impl/package-info.java
rename to providers/host/src/main/java/org/onosproject/provider/host/impl/package-info.java
diff --git a/providers/host/src/test/java/org/onlab/onos/provider/host/impl/HostLocationProviderTest.java b/providers/host/src/test/java/org/onosproject/provider/host/impl/HostLocationProviderTest.java
similarity index 100%
rename from providers/host/src/test/java/org/onlab/onos/provider/host/impl/HostLocationProviderTest.java
rename to providers/host/src/test/java/org/onosproject/provider/host/impl/HostLocationProviderTest.java
diff --git a/providers/lldp/src/main/java/org/onlab/onos/provider/lldp/impl/LLDPLinkProvider.java b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LLDPLinkProvider.java
similarity index 100%
rename from providers/lldp/src/main/java/org/onlab/onos/provider/lldp/impl/LLDPLinkProvider.java
rename to providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LLDPLinkProvider.java
diff --git a/providers/lldp/src/main/java/org/onlab/onos/provider/lldp/impl/LinkDiscovery.java b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LinkDiscovery.java
similarity index 100%
rename from providers/lldp/src/main/java/org/onlab/onos/provider/lldp/impl/LinkDiscovery.java
rename to providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/LinkDiscovery.java
diff --git a/providers/lldp/src/main/java/org/onlab/onos/provider/lldp/impl/package-info.java b/providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/package-info.java
similarity index 100%
rename from providers/lldp/src/main/java/org/onlab/onos/provider/lldp/impl/package-info.java
rename to providers/lldp/src/main/java/org/onosproject/provider/lldp/impl/package-info.java
diff --git a/providers/lldp/src/test/java/org/onlab/onos/provider/lldp/impl/LLDPLinkProviderTest.java b/providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LLDPLinkProviderTest.java
similarity index 100%
rename from providers/lldp/src/test/java/org/onlab/onos/provider/lldp/impl/LLDPLinkProviderTest.java
rename to providers/lldp/src/test/java/org/onosproject/provider/lldp/impl/LLDPLinkProviderTest.java
diff --git a/providers/openflow/device/src/main/java/org/onlab/onos/provider/of/device/impl/OpenFlowDeviceProvider.java b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
similarity index 100%
rename from providers/openflow/device/src/main/java/org/onlab/onos/provider/of/device/impl/OpenFlowDeviceProvider.java
rename to providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProvider.java
diff --git a/providers/openflow/device/src/main/java/org/onlab/onos/provider/of/device/impl/package-info.java b/providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/package-info.java
similarity index 100%
rename from providers/openflow/device/src/main/java/org/onlab/onos/provider/of/device/impl/package-info.java
rename to providers/openflow/device/src/main/java/org/onosproject/provider/of/device/impl/package-info.java
diff --git a/providers/openflow/device/src/test/java/org/onlab/onos/provider/of/device/impl/OpenFlowDeviceProviderTest.java b/providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java
similarity index 100%
rename from providers/openflow/device/src/test/java/org/onlab/onos/provider/of/device/impl/OpenFlowDeviceProviderTest.java
rename to providers/openflow/device/src/test/java/org/onosproject/provider/of/device/impl/OpenFlowDeviceProviderTest.java
diff --git a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowEntryBuilder.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
similarity index 100%
rename from providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowEntryBuilder.java
rename to providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowEntryBuilder.java
diff --git a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowModBuilder.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java
similarity index 100%
rename from providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowModBuilder.java
rename to providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilder.java
diff --git a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowModBuilderVer10.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java
similarity index 100%
rename from providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowModBuilderVer10.java
rename to providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer10.java
diff --git a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowModBuilderVer13.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
similarity index 100%
rename from providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowModBuilderVer13.java
rename to providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
diff --git a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowStatsCollector.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowStatsCollector.java
similarity index 100%
rename from providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowStatsCollector.java
rename to providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowStatsCollector.java
diff --git a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/OpenFlowRuleProvider.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
similarity index 100%
rename from providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/OpenFlowRuleProvider.java
rename to providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/OpenFlowRuleProvider.java
diff --git a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/package-info.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/package-info.java
similarity index 100%
rename from providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/package-info.java
rename to providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/package-info.java
diff --git a/providers/openflow/host/src/main/java/org/onlab/onos/provider/of/host/impl/OpenFlowHostProvider.java b/providers/openflow/host/src/main/java/org/onosproject/provider/of/host/impl/OpenFlowHostProvider.java
similarity index 100%
rename from providers/openflow/host/src/main/java/org/onlab/onos/provider/of/host/impl/OpenFlowHostProvider.java
rename to providers/openflow/host/src/main/java/org/onosproject/provider/of/host/impl/OpenFlowHostProvider.java
diff --git a/providers/openflow/host/src/main/java/org/onlab/onos/provider/of/host/impl/package-info.java b/providers/openflow/host/src/main/java/org/onosproject/provider/of/host/impl/package-info.java
similarity index 100%
rename from providers/openflow/host/src/main/java/org/onlab/onos/provider/of/host/impl/package-info.java
rename to providers/openflow/host/src/main/java/org/onosproject/provider/of/host/impl/package-info.java
diff --git a/providers/openflow/host/src/test/java/org/onlab/onos/provider/of/host/impl/OpenFlowHostProviderTest.java b/providers/openflow/host/src/test/java/org/onosproject/provider/of/host/impl/OpenFlowHostProviderTest.java
similarity index 100%
rename from providers/openflow/host/src/test/java/org/onlab/onos/provider/of/host/impl/OpenFlowHostProviderTest.java
rename to providers/openflow/host/src/test/java/org/onosproject/provider/of/host/impl/OpenFlowHostProviderTest.java
diff --git a/providers/openflow/link/src/main/java/org/onlab/onos/provider/of/link/impl/LinkDiscovery.java b/providers/openflow/link/src/main/java/org/onosproject/provider/of/link/impl/LinkDiscovery.java
similarity index 100%
rename from providers/openflow/link/src/main/java/org/onlab/onos/provider/of/link/impl/LinkDiscovery.java
rename to providers/openflow/link/src/main/java/org/onosproject/provider/of/link/impl/LinkDiscovery.java
diff --git a/providers/openflow/link/src/main/java/org/onlab/onos/provider/of/link/impl/OpenFlowLinkProvider.java b/providers/openflow/link/src/main/java/org/onosproject/provider/of/link/impl/OpenFlowLinkProvider.java
similarity index 100%
rename from providers/openflow/link/src/main/java/org/onlab/onos/provider/of/link/impl/OpenFlowLinkProvider.java
rename to providers/openflow/link/src/main/java/org/onosproject/provider/of/link/impl/OpenFlowLinkProvider.java
diff --git a/providers/openflow/link/src/main/java/org/onlab/onos/provider/of/link/impl/package-info.java b/providers/openflow/link/src/main/java/org/onosproject/provider/of/link/impl/package-info.java
similarity index 100%
rename from providers/openflow/link/src/main/java/org/onlab/onos/provider/of/link/impl/package-info.java
rename to providers/openflow/link/src/main/java/org/onosproject/provider/of/link/impl/package-info.java
diff --git a/providers/openflow/link/src/test/java/org/onlab/onos/provider/of/link/impl/OpenFlowLinkProviderTest.java b/providers/openflow/link/src/test/java/org/onosproject/provider/of/link/impl/OpenFlowLinkProviderTest.java
similarity index 100%
rename from providers/openflow/link/src/test/java/org/onlab/onos/provider/of/link/impl/OpenFlowLinkProviderTest.java
rename to providers/openflow/link/src/test/java/org/onosproject/provider/of/link/impl/OpenFlowLinkProviderTest.java
diff --git a/providers/openflow/packet/src/main/java/org/onlab/onos/provider/of/packet/impl/OpenFlowCorePacketContext.java b/providers/openflow/packet/src/main/java/org/onosproject/provider/of/packet/impl/OpenFlowCorePacketContext.java
similarity index 100%
rename from providers/openflow/packet/src/main/java/org/onlab/onos/provider/of/packet/impl/OpenFlowCorePacketContext.java
rename to providers/openflow/packet/src/main/java/org/onosproject/provider/of/packet/impl/OpenFlowCorePacketContext.java
diff --git a/providers/openflow/packet/src/main/java/org/onlab/onos/provider/of/packet/impl/OpenFlowPacketProvider.java b/providers/openflow/packet/src/main/java/org/onosproject/provider/of/packet/impl/OpenFlowPacketProvider.java
similarity index 100%
rename from providers/openflow/packet/src/main/java/org/onlab/onos/provider/of/packet/impl/OpenFlowPacketProvider.java
rename to providers/openflow/packet/src/main/java/org/onosproject/provider/of/packet/impl/OpenFlowPacketProvider.java
diff --git a/providers/openflow/packet/src/main/java/org/onlab/onos/provider/of/packet/impl/package-info.java b/providers/openflow/packet/src/main/java/org/onosproject/provider/of/packet/impl/package-info.java
similarity index 100%
rename from providers/openflow/packet/src/main/java/org/onlab/onos/provider/of/packet/impl/package-info.java
rename to providers/openflow/packet/src/main/java/org/onosproject/provider/of/packet/impl/package-info.java
diff --git a/providers/openflow/packet/src/test/java/org/onlab/onos/provider/of/packet/impl/OpenFlowPacketProviderTest.java b/providers/openflow/packet/src/test/java/org/onosproject/provider/of/packet/impl/OpenFlowPacketProviderTest.java
similarity index 100%
rename from providers/openflow/packet/src/test/java/org/onlab/onos/provider/of/packet/impl/OpenFlowPacketProviderTest.java
rename to providers/openflow/packet/src/test/java/org/onosproject/provider/of/packet/impl/OpenFlowPacketProviderTest.java
diff --git a/web/api/src/main/java/org/onlab/onos/codec/impl/AnnotatedCodec.java b/web/api/src/main/java/org/onosproject/codec/impl/AnnotatedCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/codec/impl/AnnotatedCodec.java
rename to web/api/src/main/java/org/onosproject/codec/impl/AnnotatedCodec.java
diff --git a/web/api/src/main/java/org/onlab/onos/codec/impl/AnnotationsCodec.java b/web/api/src/main/java/org/onosproject/codec/impl/AnnotationsCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/codec/impl/AnnotationsCodec.java
rename to web/api/src/main/java/org/onosproject/codec/impl/AnnotationsCodec.java
diff --git a/web/api/src/main/java/org/onlab/onos/codec/impl/CodecManager.java b/web/api/src/main/java/org/onosproject/codec/impl/CodecManager.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/codec/impl/CodecManager.java
rename to web/api/src/main/java/org/onosproject/codec/impl/CodecManager.java
diff --git a/web/api/src/main/java/org/onlab/onos/codec/impl/ConnectPointCodec.java b/web/api/src/main/java/org/onosproject/codec/impl/ConnectPointCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/codec/impl/ConnectPointCodec.java
rename to web/api/src/main/java/org/onosproject/codec/impl/ConnectPointCodec.java
diff --git a/web/api/src/main/java/org/onlab/onos/codec/impl/DeviceCodec.java b/web/api/src/main/java/org/onosproject/codec/impl/DeviceCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/codec/impl/DeviceCodec.java
rename to web/api/src/main/java/org/onosproject/codec/impl/DeviceCodec.java
diff --git a/web/api/src/main/java/org/onlab/onos/codec/impl/LinkCodec.java b/web/api/src/main/java/org/onosproject/codec/impl/LinkCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/codec/impl/LinkCodec.java
rename to web/api/src/main/java/org/onosproject/codec/impl/LinkCodec.java
diff --git a/web/api/src/main/java/org/onlab/onos/codec/impl/PortCodec.java b/web/api/src/main/java/org/onosproject/codec/impl/PortCodec.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/codec/impl/PortCodec.java
rename to web/api/src/main/java/org/onosproject/codec/impl/PortCodec.java
diff --git a/web/api/src/main/java/org/onlab/onos/codec/impl/package-info.java b/web/api/src/main/java/org/onosproject/codec/impl/package-info.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/codec/impl/package-info.java
rename to web/api/src/main/java/org/onosproject/codec/impl/package-info.java
diff --git a/web/api/src/main/java/org/onlab/onos/rest/AbstractWebResource.java b/web/api/src/main/java/org/onosproject/rest/AbstractWebResource.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/rest/AbstractWebResource.java
rename to web/api/src/main/java/org/onosproject/rest/AbstractWebResource.java
diff --git a/web/api/src/main/java/org/onlab/onos/rest/ConfigProvider.java b/web/api/src/main/java/org/onosproject/rest/ConfigProvider.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/rest/ConfigProvider.java
rename to web/api/src/main/java/org/onosproject/rest/ConfigProvider.java
diff --git a/web/api/src/main/java/org/onlab/onos/rest/ConfigResource.java b/web/api/src/main/java/org/onosproject/rest/ConfigResource.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/rest/ConfigResource.java
rename to web/api/src/main/java/org/onosproject/rest/ConfigResource.java
diff --git a/web/api/src/main/java/org/onlab/onos/rest/DevicesWebResource.java b/web/api/src/main/java/org/onosproject/rest/DevicesWebResource.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/rest/DevicesWebResource.java
rename to web/api/src/main/java/org/onosproject/rest/DevicesWebResource.java
diff --git a/web/api/src/main/java/org/onlab/onos/rest/GreetResource.java b/web/api/src/main/java/org/onosproject/rest/GreetResource.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/rest/GreetResource.java
rename to web/api/src/main/java/org/onosproject/rest/GreetResource.java
diff --git a/web/api/src/main/java/org/onlab/onos/rest/JsonBodyWriter.java b/web/api/src/main/java/org/onosproject/rest/JsonBodyWriter.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/rest/JsonBodyWriter.java
rename to web/api/src/main/java/org/onosproject/rest/JsonBodyWriter.java
diff --git a/web/api/src/main/java/org/onlab/onos/rest/LinksWebResource.java b/web/api/src/main/java/org/onosproject/rest/LinksWebResource.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/rest/LinksWebResource.java
rename to web/api/src/main/java/org/onosproject/rest/LinksWebResource.java
diff --git a/web/api/src/main/java/org/onlab/onos/rest/exceptions/AbstractMapper.java b/web/api/src/main/java/org/onosproject/rest/exceptions/AbstractMapper.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/rest/exceptions/AbstractMapper.java
rename to web/api/src/main/java/org/onosproject/rest/exceptions/AbstractMapper.java
diff --git a/web/api/src/main/java/org/onlab/onos/rest/exceptions/EntityNotFoundMapper.java b/web/api/src/main/java/org/onosproject/rest/exceptions/EntityNotFoundMapper.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/rest/exceptions/EntityNotFoundMapper.java
rename to web/api/src/main/java/org/onosproject/rest/exceptions/EntityNotFoundMapper.java
diff --git a/web/api/src/main/java/org/onlab/onos/rest/exceptions/ServerErrorMapper.java b/web/api/src/main/java/org/onosproject/rest/exceptions/ServerErrorMapper.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/rest/exceptions/ServerErrorMapper.java
rename to web/api/src/main/java/org/onosproject/rest/exceptions/ServerErrorMapper.java
diff --git a/web/api/src/main/java/org/onlab/onos/rest/exceptions/ServiceNotFoundMapper.java b/web/api/src/main/java/org/onosproject/rest/exceptions/ServiceNotFoundMapper.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/rest/exceptions/ServiceNotFoundMapper.java
rename to web/api/src/main/java/org/onosproject/rest/exceptions/ServiceNotFoundMapper.java
diff --git a/web/api/src/main/java/org/onlab/onos/rest/exceptions/package-info.java b/web/api/src/main/java/org/onosproject/rest/exceptions/package-info.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/rest/exceptions/package-info.java
rename to web/api/src/main/java/org/onosproject/rest/exceptions/package-info.java
diff --git a/web/api/src/main/java/org/onlab/onos/rest/package-info.java b/web/api/src/main/java/org/onosproject/rest/package-info.java
similarity index 100%
rename from web/api/src/main/java/org/onlab/onos/rest/package-info.java
rename to web/api/src/main/java/org/onosproject/rest/package-info.java
diff --git a/web/api/src/test/java/org/onlab/onos/rest/GreetResourceTest.java b/web/api/src/test/java/org/onosproject/rest/GreetResourceTest.java
similarity index 100%
rename from web/api/src/test/java/org/onlab/onos/rest/GreetResourceTest.java
rename to web/api/src/test/java/org/onosproject/rest/GreetResourceTest.java
diff --git a/web/api/src/test/java/org/onlab/onos/rest/topo.json b/web/api/src/test/java/org/onosproject/rest/topo.json
similarity index 100%
rename from web/api/src/test/java/org/onlab/onos/rest/topo.json
rename to web/api/src/test/java/org/onosproject/rest/topo.json
diff --git a/web/gui/src/main/java/org/onlab/onos/gui/GuiWebSocketServlet.java b/web/gui/src/main/java/org/onosproject/gui/GuiWebSocketServlet.java
similarity index 100%
rename from web/gui/src/main/java/org/onlab/onos/gui/GuiWebSocketServlet.java
rename to web/gui/src/main/java/org/onosproject/gui/GuiWebSocketServlet.java
diff --git a/web/gui/src/main/java/org/onlab/onos/gui/TopologyResource.java b/web/gui/src/main/java/org/onosproject/gui/TopologyResource.java
similarity index 100%
rename from web/gui/src/main/java/org/onlab/onos/gui/TopologyResource.java
rename to web/gui/src/main/java/org/onosproject/gui/TopologyResource.java
diff --git a/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewIntentFilter.java b/web/gui/src/main/java/org/onosproject/gui/TopologyViewIntentFilter.java
similarity index 100%
rename from web/gui/src/main/java/org/onlab/onos/gui/TopologyViewIntentFilter.java
rename to web/gui/src/main/java/org/onosproject/gui/TopologyViewIntentFilter.java
diff --git a/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java b/web/gui/src/main/java/org/onosproject/gui/TopologyViewMessages.java
similarity index 100%
rename from web/gui/src/main/java/org/onlab/onos/gui/TopologyViewMessages.java
rename to web/gui/src/main/java/org/onosproject/gui/TopologyViewMessages.java
diff --git a/web/gui/src/main/java/org/onlab/onos/gui/TopologyViewWebSocket.java b/web/gui/src/main/java/org/onosproject/gui/TopologyViewWebSocket.java
similarity index 100%
rename from web/gui/src/main/java/org/onlab/onos/gui/TopologyViewWebSocket.java
rename to web/gui/src/main/java/org/onosproject/gui/TopologyViewWebSocket.java
diff --git a/web/gui/src/main/java/org/onlab/onos/gui/package-info.java b/web/gui/src/main/java/org/onosproject/gui/package-info.java
similarity index 100%
rename from web/gui/src/main/java/org/onlab/onos/gui/package-info.java
rename to web/gui/src/main/java/org/onosproject/gui/package-info.java