diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/__init__.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/__init__.py
index 5416f23..cd8371b 100644
--- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/__init__.py
+++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/__init__.py
@@ -1,3 +1,3 @@
 """
-Base module
+    Base module
 """
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/app.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/app.py
index 383af1f..adc8fa4 100644
--- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/app.py
+++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/app.py
@@ -5,7 +5,7 @@ import os, inspect, time
 
 # Application imports
 from utils.settings import Settings
-from context.controller import Controller
+from core.controller import Controller
 from __builtins__ import EventSystem
 
 
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/__init__.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/__init__.py
deleted file mode 100644
index 90cfadc..0000000
--- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-"""
-    Gtk Bound Signal Module
-"""
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/__init__.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/__init__.py
new file mode 100644
index 0000000..3641b89
--- /dev/null
+++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/__init__.py
@@ -0,0 +1,3 @@
+"""
+    Core Module
+"""
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/controller.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/controller.py
similarity index 100%
rename from src/versions/solarfm-0.0.1/SolarFM/solarfm/context/controller.py
rename to src/versions/solarfm-0.0.1/SolarFM/solarfm/core/controller.py
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/controller_data.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/controller_data.py
similarity index 97%
rename from src/versions/solarfm-0.0.1/SolarFM/solarfm/context/controller_data.py
rename to src/versions/solarfm-0.0.1/SolarFM/solarfm/core/controller_data.py
index 12437a8..b94766b 100644
--- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/controller_data.py
+++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/controller_data.py
@@ -1,5 +1,6 @@
 # Python imports
 import sys, os, signal
+from dataclasses import dataclass
 
 # Lib imports
 import gi
@@ -11,6 +12,7 @@ from shellfm.windows.controller import WindowController
 from plugins.plugins import Plugins
 
 
+@dataclass(slots=True)
 class State:
     wid: int  = None
     tid: int  = None
@@ -21,6 +23,7 @@ class State:
 
 class Controller_Data:
     """ Controller_Data contains most of the state of the app at ay given time. It also has some support methods. """
+    __slots__ = "settings", "builder", "logger", "keybindings", "trashman", "fm_controller", "window", "window1", "window2", "window3", "window4"
 
     def setup_controller_data(self, _settings: type) -> None:
         self.settings            = _settings
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/__init__.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/__init__.py
similarity index 100%
rename from src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/__init__.py
rename to src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/__init__.py
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/exception_hook_mixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/exception_hook_mixin.py
similarity index 100%
rename from src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/exception_hook_mixin.py
rename to src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/exception_hook_mixin.py
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/show_hide_mixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/show_hide_mixin.py
similarity index 100%
rename from src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/show_hide_mixin.py
rename to src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/show_hide_mixin.py
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/__init__.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/ui/__init__.py
similarity index 100%
rename from src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/__init__.py
rename to src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/ui/__init__.py
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/grid_mixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/ui/grid_mixin.py
similarity index 100%
rename from src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/grid_mixin.py
rename to src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/ui/grid_mixin.py
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/pane_mixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/ui/pane_mixin.py
similarity index 100%
rename from src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/pane_mixin.py
rename to src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/ui/pane_mixin.py
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/tab_mixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/ui/tab_mixin.py
similarity index 100%
rename from src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/tab_mixin.py
rename to src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/ui/tab_mixin.py
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/widget_file_action_mixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/ui/widget_file_action_mixin.py
similarity index 100%
rename from src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/widget_file_action_mixin.py
rename to src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/ui/widget_file_action_mixin.py
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/window_mixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/ui/window_mixin.py
similarity index 100%
rename from src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui/window_mixin.py
rename to src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/ui/window_mixin.py
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui_mixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/ui_mixin.py
similarity index 100%
rename from src/versions/solarfm-0.0.1/SolarFM/solarfm/context/mixins/ui_mixin.py
rename to src/versions/solarfm-0.0.1/SolarFM/solarfm/core/mixins/ui_mixin.py
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/signals/__init__.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/signals/__init__.py
similarity index 100%
rename from src/versions/solarfm-0.0.1/SolarFM/solarfm/context/signals/__init__.py
rename to src/versions/solarfm-0.0.1/SolarFM/solarfm/core/signals/__init__.py
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/signals/ipc_signals_mixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/signals/ipc_signals_mixin.py
similarity index 100%
rename from src/versions/solarfm-0.0.1/SolarFM/solarfm/context/signals/ipc_signals_mixin.py
rename to src/versions/solarfm-0.0.1/SolarFM/solarfm/core/signals/ipc_signals_mixin.py
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/context/signals/keyboard_signals_mixin.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/core/signals/keyboard_signals_mixin.py
similarity index 100%
rename from src/versions/solarfm-0.0.1/SolarFM/solarfm/context/signals/keyboard_signals_mixin.py
rename to src/versions/solarfm-0.0.1/SolarFM/solarfm/core/signals/keyboard_signals_mixin.py
diff --git a/src/versions/solarfm-0.0.1/SolarFM/solarfm/utils/ipc_server.py b/src/versions/solarfm-0.0.1/SolarFM/solarfm/utils/ipc_server.py
index 27a0095..23d19b7 100644
--- a/src/versions/solarfm-0.0.1/SolarFM/solarfm/utils/ipc_server.py
+++ b/src/versions/solarfm-0.0.1/SolarFM/solarfm/utils/ipc_server.py
@@ -20,14 +20,20 @@ class IPCServer:
     def __init__(self, conn_type: str = "socket"):
         self.is_ipc_alive   = False
         self._conn_type     = conn_type
+        self.ipc_port       = 4848
+        self.ipc_address    = '127.0.0.1'
         self.ipc_authkey    = b'solarfm-ipc'
         self.ipc_timeout    = 15.0
 
         if conn_type == "socket":
             self.ipc_address    = '/tmp/solarfm-ipc.sock'
-        else:
-            self.ipc_address    = '127.0.0.1'
-            self.ipc_port       = 4848
+        elif conn_type == "full_network":
+            self.ipc_address    = '0.0.0.0'
+        elif conn_type == "full_network_unsecured":
+            self.ipc_authkey    = None
+            self.ipc_address    = '0.0.0.0'
+        elif conn_type == "local_network_unsecured":
+            self.ipc_authkey    = None
 
 
     @threaded
@@ -37,8 +43,10 @@ class IPCServer:
                 return
 
             listener = Listener(address=self.ipc_address, family="AF_UNIX", authkey=self.ipc_authkey)
-        else:
+        elif "unsecured" not in conn_type:
             listener = Listener((self.ipc_address, self.ipc_port), authkey=self.ipc_authkey)
+        else:
+            listener = Listener((self.ipc_address, self.ipc_port))
 
 
         self.is_ipc_alive = True
@@ -80,9 +88,10 @@ class IPCServer:
         try:
             if self._conn_type == "socket":
                 conn = Client(address=self.ipc_address, family="AF_UNIX", authkey=self.ipc_authkey)
-            else:
+            elif "unsecured" not in conn_type:
                 conn = Client((self.ipc_address, self.ipc_port), authkey=self.ipc_authkey)
-
+            else:
+                conn = Client((self.ipc_address, self.ipc_port))
 
             conn.send(message)
             conn.send('close connection')
diff --git a/src/versions/solarfm-0.0.1/SolarFM/tests/__init__.py b/src/versions/solarfm-0.0.1/SolarFM/tests/__init__.py
new file mode 100644
index 0000000..fa1889d
--- /dev/null
+++ b/src/versions/solarfm-0.0.1/SolarFM/tests/__init__.py
@@ -0,0 +1,3 @@
+"""
+    Tests Module
+"""