diff --git a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
index 54b6337..288a9a5 100644
--- a/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
+++ b/apps/bgprouter/src/main/java/org/onosproject/bgprouter/BgpRouter.java
@@ -22,7 +22,7 @@
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
-import org.onosproject.incubator.component.ComponentService;
+import org.onosproject.component.ComponentService;
 import org.onosproject.incubator.net.intf.InterfaceService;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.config.NetworkConfigRegistry;
diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
index 3ff0c9c..40ed59c 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
+++ b/apps/sdnip/src/main/java/org/onosproject/sdnip/SdnIp.java
@@ -24,7 +24,7 @@
 import org.onosproject.app.ApplicationService;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
-import org.onosproject.incubator.component.ComponentService;
+import org.onosproject.component.ComponentService;
 import org.onosproject.incubator.net.intf.InterfaceService;
 import org.onosproject.net.config.ConfigFactory;
 import org.onosproject.net.config.NetworkConfigRegistry;
diff --git a/apps/vrouter/src/main/java/org/onosproject/vrouter/Vrouter.java b/apps/vrouter/src/main/java/org/onosproject/vrouter/Vrouter.java
index fac2cbb..8c9c58f 100644
--- a/apps/vrouter/src/main/java/org/onosproject/vrouter/Vrouter.java
+++ b/apps/vrouter/src/main/java/org/onosproject/vrouter/Vrouter.java
@@ -23,7 +23,7 @@
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
-import org.onosproject.incubator.component.ComponentService;
+import org.onosproject.component.ComponentService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/component/ComponentService.java b/core/api/src/main/java/org/onosproject/component/ComponentService.java
similarity index 96%
rename from incubator/api/src/main/java/org/onosproject/incubator/component/ComponentService.java
rename to core/api/src/main/java/org/onosproject/component/ComponentService.java
index f8cc0cd..06398e4 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/component/ComponentService.java
+++ b/core/api/src/main/java/org/onosproject/component/ComponentService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.component;
+package org.onosproject.component;
 
 import org.onosproject.core.ApplicationId;
 
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/component/package-info.java b/core/api/src/main/java/org/onosproject/component/package-info.java
similarity index 93%
rename from incubator/api/src/main/java/org/onosproject/incubator/component/package-info.java
rename to core/api/src/main/java/org/onosproject/component/package-info.java
index a9cbd33..6ca3de0 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/component/package-info.java
+++ b/core/api/src/main/java/org/onosproject/component/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Component management system.
  */
-package org.onosproject.incubator.component;
+package org.onosproject.component;
diff --git a/incubator/core/src/main/java/org/onosproject/incubator/component/impl/ComponentManager.java b/core/net/src/main/java/org/onosproject/component/impl/ComponentManager.java
similarity index 96%
rename from incubator/core/src/main/java/org/onosproject/incubator/component/impl/ComponentManager.java
rename to core/net/src/main/java/org/onosproject/component/impl/ComponentManager.java
index ead5651..29ae1ad 100644
--- a/incubator/core/src/main/java/org/onosproject/incubator/component/impl/ComponentManager.java
+++ b/core/net/src/main/java/org/onosproject/component/impl/ComponentManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.component.impl;
+package org.onosproject.component.impl;
 
 import org.apache.felix.scr.ScrService;
 import org.apache.felix.scr.annotations.Activate;
@@ -24,7 +24,7 @@
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
 import org.onosproject.core.ApplicationId;
-import org.onosproject.incubator.component.ComponentService;
+import org.onosproject.component.ComponentService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/incubator/core/src/main/java/org/onosproject/incubator/component/impl/package-info.java b/core/net/src/main/java/org/onosproject/component/impl/package-info.java
similarity index 92%
rename from incubator/core/src/main/java/org/onosproject/incubator/component/impl/package-info.java
rename to core/net/src/main/java/org/onosproject/component/impl/package-info.java
index 445767c..4e82eb8 100644
--- a/incubator/core/src/main/java/org/onosproject/incubator/component/impl/package-info.java
+++ b/core/net/src/main/java/org/onosproject/component/impl/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Implementation of component management system.
  */
-package org.onosproject.incubator.component.impl;
+package org.onosproject.component.impl;
diff --git a/core/net/src/main/java/org/onosproject/net/driver/impl/DriverRegistryManager.java b/core/net/src/main/java/org/onosproject/net/driver/impl/DriverRegistryManager.java
index a034887..1a54b45 100644
--- a/core/net/src/main/java/org/onosproject/net/driver/impl/DriverRegistryManager.java
+++ b/core/net/src/main/java/org/onosproject/net/driver/impl/DriverRegistryManager.java
@@ -27,7 +27,7 @@
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
 import org.onosproject.cfg.ComponentConfigService;
-import org.onosproject.incubator.component.ComponentService;
+import org.onosproject.component.ComponentService;
 import org.onosproject.net.device.DeviceService;
 import org.onosproject.net.driver.Behaviour;
 import org.onosproject.net.driver.DefaultDriverProvider;
diff --git a/features/BUCK b/features/BUCK
index 48e64de..8094ff9 100644
--- a/features/BUCK
+++ b/features/BUCK
@@ -96,7 +96,6 @@
   required_features = ['onos-core'],
   included_bundles = [
     '//incubator/net:onos-incubator-net',
-    '//incubator/core:onos-incubator-core',
     '//incubator/store:onos-incubator-store',
     '//incubator/rpc:onos-incubator-rpc',
   ]
diff --git a/incubator/core/BUCK b/incubator/core/BUCK
deleted file mode 100644
index 068a43b..0000000
--- a/incubator/core/BUCK
+++ /dev/null
@@ -1,14 +0,0 @@
-COMPILE_DEPS = [
-    '//lib:CORE_DEPS',
-    '//incubator/api:onos-incubator-api',
-]
-
-TEST_DEPS = [
-    '//lib:TEST',
-]
-
-osgi_jar_with_tests (
-    deps = COMPILE_DEPS,
-    test_deps = TEST_DEPS,
-    visibility = ['PUBLIC'],
-)
diff --git a/incubator/core/pom.xml b/incubator/core/pom.xml
deleted file mode 100644
index 936229b..0000000
--- a/incubator/core/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ Copyright 2015-present Open Networking Laboratory
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onosproject</groupId>
-        <artifactId>onos-incubator</artifactId>
-        <version>1.11.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>onos-incubator-core</artifactId>
-    <packaging>bundle</packaging>
-
-    <description>ONOS incubating core</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-incubator-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava-testlib</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymock</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr.annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/incubator/pom.xml b/incubator/pom.xml
index 310dc18..0121dd7 100644
--- a/incubator/pom.xml
+++ b/incubator/pom.xml
@@ -32,7 +32,6 @@
 
     <modules>
         <module>api</module>
-        <module>core</module>
         <module>net</module>
         <module>store</module>
         <module>protobuf-dependencies</module>
diff --git a/modules.defs b/modules.defs
index 74cd92d..b18fcbe 100644
--- a/modules.defs
+++ b/modules.defs
@@ -21,7 +21,6 @@
     '//core/store/persistence:onos-core-persistence',
 
     '//incubator/net:onos-incubator-net',
-    '//incubator/core:onos-incubator-core',
     '//incubator/store:onos-incubator-store',
     '//incubator/rpc:onos-incubator-rpc',