Organized imports for main classes

Change-Id: I3b05d7f289706aef04019a820be9989f8fb54945
diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index c5ebbc5..d475fa6 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -63,8 +63,8 @@
 import net.onrc.onos.core.main.IOFSwitchPortListener;
 import net.onrc.onos.core.packet.Ethernet;
 import net.onrc.onos.core.registry.IControllerRegistryService;
-import net.onrc.onos.core.registry.RegistryException;
 import net.onrc.onos.core.registry.IControllerRegistryService.ControlChangeCallback;
+import net.onrc.onos.core.registry.RegistryException;
 
 import org.jboss.netty.bootstrap.ServerBootstrap;
 import org.jboss.netty.buffer.ChannelBuffer;
diff --git a/src/main/java/net/floodlightcontroller/core/internal/IOFSwitchFeatures.java b/src/main/java/net/floodlightcontroller/core/internal/IOFSwitchFeatures.java
index ddbb0ef..f537868 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/IOFSwitchFeatures.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/IOFSwitchFeatures.java
@@ -1,9 +1,9 @@
 package net.floodlightcontroller.core.internal;
 
-import org.openflow.protocol.statistics.OFDescriptionStatistics;
-
 import net.floodlightcontroller.core.IOFSwitch;
 
+import org.openflow.protocol.statistics.OFDescriptionStatistics;
+
 public interface IOFSwitchFeatures {
     public void setFromDescription(IOFSwitch sw, OFDescriptionStatistics description);
 }
diff --git a/src/main/java/net/floodlightcontroller/core/internal/OFMessageFuture.java b/src/main/java/net/floodlightcontroller/core/internal/OFMessageFuture.java
index f01e179..60b932f 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/OFMessageFuture.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/OFMessageFuture.java
@@ -23,12 +23,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.openflow.protocol.OFMessage;
-import org.openflow.protocol.OFType;
-
 import net.floodlightcontroller.core.IOFSwitch;
 import net.floodlightcontroller.threadpool.IThreadPoolService;
 
+import org.openflow.protocol.OFMessage;
+import org.openflow.protocol.OFType;
+
 /**
  * A Future object used to retrieve asynchronous OFMessage replies. Unregisters
  * and cancels itself by default after 60 seconds. This class is meant to be
diff --git a/src/main/java/net/floodlightcontroller/core/internal/RoleChanger.java b/src/main/java/net/floodlightcontroller/core/internal/RoleChanger.java
index 194935c..4a21cad 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/RoleChanger.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/RoleChanger.java
@@ -8,13 +8,13 @@
 import java.util.concurrent.Delayed;
 import java.util.concurrent.TimeUnit;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import net.floodlightcontroller.core.IFloodlightProviderService.Role;
 import net.floodlightcontroller.core.IOFSwitch;
 import net.floodlightcontroller.core.annotations.LogMessageDoc;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /** 
  * This class handles sending of RoleRequest messages to all connected switches.
  *