diff --git a/onos.sh b/onos.sh
index 27e61c4..9a88a22 100755
--- a/onos.sh
+++ b/onos.sh
@@ -113,7 +113,7 @@
 #JVM_OPTS="$JVM_OPTS -XX:+PrintFlagsFinal"
 
 # Set ONOS core main class
-MAIN_CLASS="net.onrc.onos.ofcontroller.core.Main"
+MAIN_CLASS="net.onrc.onos.core.main.Main"
 
 MVN=${MVN:-mvn -o}
 ############################################
diff --git a/pom.xml b/pom.xml
index 41efcb5..c20dc0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
         <artifactId>exec-maven-plugin</artifactId>
         <version>1.2.1</version>
         <configuration>
-          <mainClass>net.onrc.onos.ofcontroller.core.Main</mainClass>
+          <mainClass>net.onrc.onos.core.main.Main</mainClass>
         </configuration>
         <executions>
         </executions>
diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index d853f9e..e7867e3 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -59,7 +59,7 @@
 import net.floodlightcontroller.core.web.CoreWebRoutable;
 import net.floodlightcontroller.restserver.IRestApiService;
 import net.floodlightcontroller.threadpool.IThreadPoolService;
-import net.onrc.onos.ofcontroller.core.IOFSwitchPortListener;
+import net.onrc.onos.core.main.IOFSwitchPortListener;
 import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscoveryService;
 import net.onrc.onos.packet.Ethernet;
 import net.onrc.onos.registry.controller.IControllerRegistryService;
@@ -127,7 +127,7 @@
  * 
  * Extensions made by ONOS are:
  * - Detailed Port event: PORTCHANGED -> {PORTCHANGED, PORTADDED, PORTREMOVED} 
- *    Available as net.onrc.onos.ofcontroller.core.IOFSwitchPortListener
+ *    Available as net.onrc.onos.core.main.IOFSwitchPortListener
  * - Distributed ownership control of switch through RegistryService(IControllerRegistryService)
  * - Register ONOS services. (IControllerRegistryService)
  * - Additional DEBUG logs
diff --git a/src/main/java/net/floodlightcontroller/core/internal/OFSwitchImpl.java b/src/main/java/net/floodlightcontroller/core/internal/OFSwitchImpl.java
index 752675a..3164381 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/OFSwitchImpl.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/OFSwitchImpl.java
@@ -44,7 +44,7 @@
 import net.floodlightcontroller.core.web.serializers.DPIDSerializer;
 import net.floodlightcontroller.threadpool.IThreadPoolService;
 import net.floodlightcontroller.util.TimedCache;
-import net.onrc.onos.ofcontroller.core.IOnosRemoteSwitch;
+import net.onrc.onos.core.main.IOnosRemoteSwitch;
 
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.codehaus.jackson.annotate.JsonProperty;
diff --git a/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java b/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
index 32ce5e3..a44685b 100644
--- a/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
+++ b/src/main/java/net/onrc/onos/apps/bgproute/BgpRoute.java
@@ -29,7 +29,7 @@
 import net.onrc.onos.apps.bgproute.RibUpdate.Operation;
 import net.onrc.onos.apps.proxyarp.IArpRequester;
 import net.onrc.onos.apps.proxyarp.IProxyArpService;
-import net.onrc.onos.ofcontroller.core.config.IConfigInfoService;
+import net.onrc.onos.core.main.config.IConfigInfoService;
 import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscovery.LDUpdate;
 import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscoveryService;
 import net.onrc.onos.ofcontroller.util.CallerId;
diff --git a/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java b/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java
index 2a897a5..cc0fb84 100644
--- a/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java
+++ b/src/main/java/net/onrc/onos/apps/proxyarp/ProxyArpManager.java
@@ -26,7 +26,7 @@
 import net.onrc.onos.core.datagrid.IDatagridService;
 import net.onrc.onos.core.datagrid.IEventChannel;
 import net.onrc.onos.core.datagrid.IEventChannelListener;
-import net.onrc.onos.ofcontroller.core.config.IConfigInfoService;
+import net.onrc.onos.core.main.config.IConfigInfoService;
 import net.onrc.onos.ofcontroller.devicemanager.IOnosDeviceService;
 import net.onrc.onos.ofcontroller.flowprogrammer.IFlowPusherService;
 import net.onrc.onos.ofcontroller.networkgraph.Device;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/IOFSwitchPortListener.java b/src/main/java/net/onrc/onos/core/main/IOFSwitchPortListener.java
similarity index 91%
rename from src/main/java/net/onrc/onos/ofcontroller/core/IOFSwitchPortListener.java
rename to src/main/java/net/onrc/onos/core/main/IOFSwitchPortListener.java
index 5deae69..c7f4de1 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/core/IOFSwitchPortListener.java
+++ b/src/main/java/net/onrc/onos/core/main/IOFSwitchPortListener.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package net.onrc.onos.ofcontroller.core;
+package net.onrc.onos.core.main;
 
 import org.openflow.protocol.OFPhysicalPort;
 
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/IOnosRemoteSwitch.java b/src/main/java/net/onrc/onos/core/main/IOnosRemoteSwitch.java
similarity index 87%
rename from src/main/java/net/onrc/onos/ofcontroller/core/IOnosRemoteSwitch.java
rename to src/main/java/net/onrc/onos/core/main/IOnosRemoteSwitch.java
index c9b0e2f..0b95f42 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/core/IOnosRemoteSwitch.java
+++ b/src/main/java/net/onrc/onos/core/main/IOnosRemoteSwitch.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package net.onrc.onos.ofcontroller.core;
+package net.onrc.onos.core.main;
 
 import net.floodlightcontroller.core.IOFSwitch;
 
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/Main.java b/src/main/java/net/onrc/onos/core/main/Main.java
similarity index 97%
rename from src/main/java/net/onrc/onos/ofcontroller/core/Main.java
rename to src/main/java/net/onrc/onos/core/main/Main.java
index a80ac36..50b21c4 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/core/Main.java
+++ b/src/main/java/net/onrc/onos/core/main/Main.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.ofcontroller.core;
+package net.onrc.onos.core.main;
 
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/config/DefaultConfiguration.java b/src/main/java/net/onrc/onos/core/main/config/DefaultConfiguration.java
similarity index 97%
rename from src/main/java/net/onrc/onos/ofcontroller/core/config/DefaultConfiguration.java
rename to src/main/java/net/onrc/onos/core/main/config/DefaultConfiguration.java
index e4a9b26..2feb69d 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/core/config/DefaultConfiguration.java
+++ b/src/main/java/net/onrc/onos/core/main/config/DefaultConfiguration.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.ofcontroller.core.config;
+package net.onrc.onos.core.main.config;
 
 import java.net.InetAddress;
 import java.util.ArrayList;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/config/IConfigInfoService.java b/src/main/java/net/onrc/onos/core/main/config/IConfigInfoService.java
similarity index 96%
rename from src/main/java/net/onrc/onos/ofcontroller/core/config/IConfigInfoService.java
rename to src/main/java/net/onrc/onos/core/main/config/IConfigInfoService.java
index 5f646a4..4ca8535 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/core/config/IConfigInfoService.java
+++ b/src/main/java/net/onrc/onos/core/main/config/IConfigInfoService.java
@@ -1,4 +1,4 @@
-package net.onrc.onos.ofcontroller.core.config;
+package net.onrc.onos.core.main.config;
 
 import java.net.InetAddress;
 
diff --git a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java b/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
index d71848b..4134101 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
@@ -15,7 +15,7 @@
 import net.floodlightcontroller.core.module.IFloodlightService;
 import net.floodlightcontroller.core.util.SingletonTask;
 import net.floodlightcontroller.threadpool.IThreadPoolService;
-import net.onrc.onos.ofcontroller.core.IOFSwitchPortListener;
+import net.onrc.onos.core.main.IOFSwitchPortListener;
 import net.onrc.onos.ofcontroller.devicemanager.IOnosDeviceListener;
 import net.onrc.onos.ofcontroller.devicemanager.IOnosDeviceService;
 import net.onrc.onos.ofcontroller.devicemanager.OnosDevice;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index 39444b9..aa6e1d4 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -56,7 +56,7 @@
 import net.floodlightcontroller.threadpool.IThreadPoolService;
 import net.floodlightcontroller.util.EventHistory;
 import net.floodlightcontroller.util.EventHistory.EvAction;
-import net.onrc.onos.ofcontroller.core.IOnosRemoteSwitch;
+import net.onrc.onos.core.main.IOnosRemoteSwitch;
 import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscovery;
 import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscovery.LDUpdate;
 import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscovery.UpdateOperation;
diff --git a/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule b/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
index b46b343..abd692b 100644
--- a/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
+++ b/src/main/resources/META-INF/services/net.floodlightcontroller.core.module.IFloodlightModule
@@ -16,7 +16,7 @@
 net.onrc.onos.registry.controller.StandaloneRegistry
 net.onrc.onos.apps.forwarding.Forwarding
 net.onrc.onos.apps.proxyarp.ProxyArpManager
-net.onrc.onos.ofcontroller.core.config.DefaultConfiguration
+net.onrc.onos.core.main.config.DefaultConfiguration
 net.onrc.onos.ofcontroller.devicemanager.OnosDeviceManager
 net.onrc.onos.ofcontroller.networkgraph.NetworkGraphModule
 net.onrc.onos.core.intent.runtime.PathCalcRuntimeModule
diff --git a/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java b/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
index a0dc06b..2980c9f 100644
--- a/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
+++ b/src/test/java/net/floodlightcontroller/core/internal/ControllerTest.java
@@ -55,7 +55,7 @@
 import net.floodlightcontroller.restserver.RestApiServer;
 import net.floodlightcontroller.test.FloodlightTestCase;
 import net.floodlightcontroller.threadpool.IThreadPoolService;
-import net.onrc.onos.ofcontroller.core.IOFSwitchPortListener;
+import net.onrc.onos.core.main.IOFSwitchPortListener;
 import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscoveryService;
 import net.onrc.onos.ofcontroller.linkdiscovery.internal.LinkDiscoveryManager;
 import net.onrc.onos.packet.ARP;
diff --git a/start-onos-jacoco.sh b/start-onos-jacoco.sh
index f2da4e0..55bafd5 100755
--- a/start-onos-jacoco.sh
+++ b/start-onos-jacoco.sh
@@ -37,7 +37,7 @@
 JVM_OPTS="$JVM_OPTS -Dhazelcast.logging.type=slf4j"
 
 # Set ONOS core main class
-MAIN_CLASS="net.onrc.onos.ofcontroller.core.Main"
+MAIN_CLASS="net.onrc.onos.core.main.Main"
 
 if [ -z "${MVN}" ]; then
     MVN="mvn -o"
diff --git a/start-onos.sh b/start-onos.sh
index 3da5352..83819d7 100755
--- a/start-onos.sh
+++ b/start-onos.sh
@@ -54,7 +54,7 @@
 JVM_OPTS="$JVM_OPTS -Dhazelcast.logging.type=slf4j"
 
 # Set ONOS core main class
-MAIN_CLASS="net.onrc.onos.ofcontroller.core.Main"
+MAIN_CLASS="net.onrc.onos.core.main.Main"
 
 MVN=${MVN:-mvn -o}
 
diff --git a/vm-utils/onos.py b/vm-utils/onos.py
index 2e91432..58230d6 100755
--- a/vm-utils/onos.py
+++ b/vm-utils/onos.py
@@ -53,7 +53,7 @@
     # Additions for reactive forwarding
     reactiveModules = (
             'net.onrc.onos.apps.proxyarp.ProxyArpManager',
-            'net.onrc.onos.ofcontroller.core.config.DefaultConfiguration',
+            'net.onrc.onos.core.main.config.DefaultConfiguration',
             'net.onrc.onos.apps.forwarding.Forwarding'
     )