diff --git a/src/pytop-0.0.1/Pytop/Events.py b/src/pytop-0.0.1/Pytop/Controller.py
similarity index 97%
rename from src/pytop-0.0.1/Pytop/Events.py
rename to src/pytop-0.0.1/Pytop/Controller.py
index f720ecb..268464e 100644
--- a/src/pytop-0.0.1/Pytop/Events.py
+++ b/src/pytop-0.0.1/Pytop/Controller.py
@@ -1,12 +1,13 @@
-
-# Gtk Imports
+# Gtk imports
 
 # Python imports
+
+# Application imports
 from widgets import Grid
 from utils import Dragging
 
 
-class Events:
+class Controller:
     def __init__(self, settings):
         self.settings     = settings
         self.builder      = self.settings.returnBuilder()
diff --git a/src/pytop-0.0.1/Pytop/PyTop.py b/src/pytop-0.0.1/Pytop/PyTop.py
index 9fe407f..fdb5ebc 100755
--- a/src/pytop-0.0.1/Pytop/PyTop.py
+++ b/src/pytop-0.0.1/Pytop/PyTop.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# Gtk Imports
+# Gtk imports
 import gi, faulthandler, signal
 gi.require_version('Gtk', '3.0')
 gi.require_version('WebKit2', '4.0')
@@ -11,22 +11,25 @@ from gi.repository import WebKit2 as webkit
 from gi.repository import GLib
 
 # Python imports
-from utils import Settings
-from Events import Events
 
-gdk.threads_init()
+# Application imports
+from utils import Settings
+from Controller import Controller
+
+
 class Main:
     def __init__(self):
         faulthandler.enable()
         webkit.WebView()  # Needed for glade file to load...
 
-        self.builder     = gtk.Builder()
-        self.settings    = Settings()
-        self.settings.attachBuilder(self.builder)
-        GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGINT, gtk.main_quit)
-        self.builder.connect_signals(Events(self.settings))
+        builder  = gtk.Builder()
+        settings = Settings()
+        settings.attachBuilder(builder)
+        builder.connect_signals(Controller(settings))
 
-        window = self.settings.createWindow()
+        GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGINT, gtk.main_quit)
+
+        window = settings.createWindow()
         window.fullscreen()
         window.show_all()
 
diff --git a/src/pytop-0.0.1/Pytop/utils/Dragging.py b/src/pytop-0.0.1/Pytop/utils/Dragging.py
index a0b2856..abf0a03 100644
--- a/src/pytop-0.0.1/Pytop/utils/Dragging.py
+++ b/src/pytop-0.0.1/Pytop/utils/Dragging.py
@@ -1,10 +1,16 @@
-import os, gi
+# Gtk imports
+import gi
 
 gi.require_version('Gdk', '3.0')
 
 from gi.repository import Gdk
 from gi.repository import GObject
 
+# Python imports
+import os
+
+# Application imports
+
 
 class Dragging:
     def __init__(self):
diff --git a/src/pytop-0.0.1/Pytop/utils/FileHandler.py b/src/pytop-0.0.1/Pytop/utils/FileHandler.py
index c4dfa3b..8c9434b 100644
--- a/src/pytop-0.0.1/Pytop/utils/FileHandler.py
+++ b/src/pytop-0.0.1/Pytop/utils/FileHandler.py
@@ -1,6 +1,10 @@
+# Gtk imports
 
+# Python imports
 import os, shutil, subprocess, threading
 
+# Application imports
+
 
 def threaded(fn):
     def wrapper(*args, **kwargs):
diff --git a/src/pytop-0.0.1/Pytop/utils/Settings.py b/src/pytop-0.0.1/Pytop/utils/Settings.py
index 6c612f5..ebac9f8 100644
--- a/src/pytop-0.0.1/Pytop/utils/Settings.py
+++ b/src/pytop-0.0.1/Pytop/utils/Settings.py
@@ -1,12 +1,17 @@
-
-# Gtk Imports
-import gi, cairo, os
+# Gtk imports
+import gi, cairo
 gi.require_version('Gtk', '3.0')
 gi.require_version('Gdk', '3.0')
 
 from gi.repository import Gtk as gtk
 from gi.repository import Gdk as gdk
 
+# Python imports
+import os
+
+# Application imports
+
+
 class Settings:
     def __init__(self):
         self.builder            = None
diff --git a/src/pytop-0.0.1/Pytop/widgets/Grid.py b/src/pytop-0.0.1/Pytop/widgets/Grid.py
index e27345d..ad5abdd 100644
--- a/src/pytop-0.0.1/Pytop/widgets/Grid.py
+++ b/src/pytop-0.0.1/Pytop/widgets/Grid.py
@@ -1,6 +1,4 @@
-
-
-# Gtk Imports
+# Gtk imports
 import gi
 gi.require_version('Gtk', '3.0')
 gi.require_version('Gdk', '3.0')
@@ -14,6 +12,8 @@ from gi.repository import GdkPixbuf
 import os, threading, time
 from os.path import isdir, isfile, join
 from os import listdir
+
+# Application imports
 from .Icon import Icon
 from utils.FileHandler import FileHandler
 
diff --git a/src/pytop-0.0.1/Pytop/widgets/Icon.py b/src/pytop-0.0.1/Pytop/widgets/Icon.py
index 826e408..685e644 100644
--- a/src/pytop-0.0.1/Pytop/widgets/Icon.py
+++ b/src/pytop-0.0.1/Pytop/widgets/Icon.py
@@ -1,5 +1,4 @@
-
-# Gtk Imports
+# Gtk imports
 import gi
 gi.require_version('Gtk', '3.0')
 gi.require_version('Gdk', '3.0')
@@ -11,9 +10,9 @@ from xdg.DesktopEntry import DesktopEntry
 
 # Python Imports
 import os, subprocess, hashlib, threading
-
 from os.path import isdir, isfile, join
 
+# Application imports
 
 
 def threaded(fn):