diff --git a/KlippyRest.py b/ks_includes/KlippyRest.py
similarity index 100%
rename from KlippyRest.py
rename to ks_includes/KlippyRest.py
diff --git a/KlippyWebsocket.py b/ks_includes/KlippyWebsocket.py
similarity index 100%
rename from KlippyWebsocket.py
rename to ks_includes/KlippyWebsocket.py
diff --git a/files.py b/ks_includes/files.py
similarity index 100%
rename from files.py
rename to ks_includes/files.py
diff --git a/printer.py b/ks_includes/printer.py
similarity index 100%
rename from printer.py
rename to ks_includes/printer.py
diff --git a/panels/job_status.py b/panels/job_status.py
index 0ce815c4..851029e7 100644
--- a/panels/job_status.py
+++ b/panels/job_status.py
@@ -82,7 +82,7 @@ class JobStatusPanel(ScreenPanel):
         self.labels['estop'].connect("clicked", self.emergency_stop)
         grid.attach(self.labels['estop'], 2, 2, 1, 1)
         self.labels['control'] = KlippyGtk.ButtonImage("control","Control","color3")
-        self.labels['control'].connect("clicked", self._screen._go_to_submenu, "Control")
+        self.labels['control'].connect("clicked", self._screen._go_to_submenu, "")
         grid.attach(self.labels['control'], 3, 2, 1, 1)
 
         self.panel = grid
diff --git a/screen.py b/screen.py
index e56a3735..04d225ba 100644
--- a/screen.py
+++ b/screen.py
@@ -16,11 +16,11 @@ import subprocess
 gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, Gdk, GLib
 
-from KlippyWebsocket import KlippyWebsocket
-from KlippyRest import KlippyRest
-from files import KlippyFiles
+from ks_includes.KlippyWebsocket import KlippyWebsocket
+from ks_includes.KlippyRest import KlippyRest
+from ks_includes.files import KlippyFiles
 from KlippyGtk import KlippyGtk
-from printer import Printer
+from ks_includes.printer import Printer
 
 from ks_includes.config import KlipperScreenConfig