diff --git a/src/pytop-0.0.1/Pytop/PyTop.py b/src/pytop-0.0.1/Pytop/PyTop.py
index dcd80c6..c696c51 100755
--- a/src/pytop-0.0.1/Pytop/PyTop.py
+++ b/src/pytop-0.0.1/Pytop/PyTop.py
@@ -15,8 +15,7 @@ import inspect
 
 # Application imports
 from utils import Settings
-from signal_classes import WebviewSignals
-from Controller import Controller
+from signal_classes import CrossClassSignals, WebviewSignals, GridSignals
 
 
 class Main:
@@ -31,7 +30,10 @@ class Main:
 
         # Gets the methods from the classes and sets to handler.
         # Then, builder connects to any signals it needs.
-        classes  = [WebviewSignals(settings), Controller(settings)]
+        classes  = [CrossClassSignals(settings),
+                    WebviewSignals(settings),
+                    GridSignals(settings)]
+
         handlers = {}
         for c in classes:
             methods = inspect.getmembers(c, predicate=inspect.ismethod)
diff --git a/src/pytop-0.0.1/Pytop/__init__.py b/src/pytop-0.0.1/Pytop/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/src/pytop-0.0.1/Pytop/signal_classes/CrossClassSignals.py b/src/pytop-0.0.1/Pytop/signal_classes/CrossClassSignals.py
new file mode 100644
index 0000000..08614af
--- /dev/null
+++ b/src/pytop-0.0.1/Pytop/signal_classes/CrossClassSignals.py
@@ -0,0 +1,15 @@
+# Gtk imports
+
+# Python imports
+
+# Application imports
+
+
+class CrossClassSignals:
+    def __init__(self, settings):
+        self.settings     = settings
+        self.builder      = self.settings.returnBuilder()
+
+
+    def closePopup(self, widget, data=None):
+        widget.hide()
diff --git a/src/pytop-0.0.1/Pytop/Controller.py b/src/pytop-0.0.1/Pytop/signal_classes/GridSignals.py
similarity index 88%
rename from src/pytop-0.0.1/Pytop/Controller.py
rename to src/pytop-0.0.1/Pytop/signal_classes/GridSignals.py
index b520d01..1b2226a 100644
--- a/src/pytop-0.0.1/Pytop/Controller.py
+++ b/src/pytop-0.0.1/Pytop/signal_classes/GridSignals.py
@@ -8,19 +8,20 @@ from utils import Dragging
 from utils import FileHandler
 
 
-class Controller:
+class GridSignals:
     def __init__(self, settings):
         self.filehandler  = FileHandler()
         self.settings     = settings
+
         self.builder      = self.settings.returnBuilder()
         self.desktop      = self.builder.get_object("Desktop")
+        selectedDirDialog = self.builder.get_object("selectedDirDialog")
+        filefilter        = self.builder.get_object("Folders")
 
         self.desktopPath  = self.settings.returnDesktopPath()
         self.grid         = None
 
         # Add filter to allow only folders to be selected
-        selectedDirDialog = self.builder.get_object("selectedDirDialog")
-        filefilter        = self.builder.get_object("Folders")
         selectedDirDialog.add_filter(filefilter)
         selectedDirDialog.set_filename(self.desktopPath)
 
@@ -31,15 +32,6 @@ class Controller:
         self.grid = Grid(self.desktop, self.settings)
         self.grid.setIconViewDir(newPath)
 
-    def getWindowsOnScreen(self):
-        screen        = self.settings.returnScren()
-        windowButtons = self.builder.get_object("windowButtons")
-
-
-    def closePopup(self, widget, data=None):
-        widget.hide()
-
-
 
     # File control events
     def createFile(arg):
diff --git a/src/pytop-0.0.1/Pytop/signal_classes/__init__.py b/src/pytop-0.0.1/Pytop/signal_classes/__init__.py
index 4990db3..0250d0d 100644
--- a/src/pytop-0.0.1/Pytop/signal_classes/__init__.py
+++ b/src/pytop-0.0.1/Pytop/signal_classes/__init__.py
@@ -1 +1,3 @@
+from signal_classes.CrossClassSignals import CrossClassSignals
 from signal_classes.WebviewSignals import WebviewSignals
+from signal_classes.GridSignals import GridSignals
diff --git a/src/pytop-0.0.1/Pytop/widgets/Grid.py b/src/pytop-0.0.1/Pytop/widgets/Grid.py
index 2bc1761..d60f7fb 100644
--- a/src/pytop-0.0.1/Pytop/widgets/Grid.py
+++ b/src/pytop-0.0.1/Pytop/widgets/Grid.py
@@ -49,8 +49,6 @@ class Grid:
         self.desktop.connect("button_press_event", self.iconRightClickEventManager, (self.desktop,))
 
 
-
-
     def setIconViewDir(self, path):
         self.store.clear()
 
diff --git a/src/pytop-0.0.1/pytop b/src/pytop-0.0.1/pytop
deleted file mode 100755
index 50311e9..0000000
Binary files a/src/pytop-0.0.1/pytop and /dev/null differ