diff --git a/drone/client.py b/drone/client.py
index 9553919..683f11a 100644
--- a/drone/client.py
+++ b/drone/client.py
@@ -45,10 +45,9 @@ except ImportError:
 
 # Add parent dir to PATH to import messaging_lib and config_lib
 current_dir = (os.path.dirname(os.path.realpath(__file__)))
-lib_dir = os.path.realpath(os.path.join(current_dir, '../lib'))
-sys.path.insert(0, lib_dir)
+sys.path.insert(0, os.path.realpath(os.path.join(current_dir, os.pardir, os.pardir)))
 
-import messaging
+import lib.messaging as messaging
 import modules.client_core as client_core
 import modules.animation as animation
 import modules.mavros_wrapper as mavros
diff --git a/drone/modules/client_core.py b/drone/modules/client_core.py
index c9357c6..b13ffee 100644
--- a/drone/modules/client_core.py
+++ b/drone/modules/client_core.py
@@ -15,14 +15,13 @@ import selectors2 as selectors
 from contextlib import closing
 
 # Add parent dir to PATH to import messaging_lib and config_lib
-current_dir = (os.path.dirname(os.path.realpath(__file__)))
-lib_dir = os.path.realpath(os.path.join(current_dir, '../../lib'))
-sys.path.insert(0, lib_dir)
+current_dir = os.path.dirname(os.path.realpath(__file__))
+sys.path.insert(0, os.path.realpath(os.path.join(current_dir, os.pardir, os.pardir)))
 
 logger = logging.getLogger(__name__)
 
-import messaging
-from config import ConfigManager
+import lib.messaging as messaging
+from lib.config import ConfigManager
 
 active_client = None  # needs to be refactored: Singleton \ factory callbacks
 
diff --git a/server/modules/copter_table_models.py b/server/modules/copter_table_models.py
index aa4917a..0ba92d9 100644
--- a/server/modules/copter_table_models.py
+++ b/server/modules/copter_table_models.py
@@ -10,7 +10,7 @@ from functools import partialmethod
 from PyQt5 import QtCore, QtGui, QtWidgets
 from PyQt5.QtCore import Qt as Qt, QUrl, QDir
 
-from config import ConfigManager
+from lib.config import ConfigManager
 
 # Additional custom roles to interact with various table data
 ModelDataRole = 998
diff --git a/server/modules/server_core.py b/server/modules/server_core.py
index f2ba772..021a8b2 100644
--- a/server/modules/server_core.py
+++ b/server/modules/server_core.py
@@ -12,11 +12,11 @@ import traceback
 
 # Add parent dir to PATH to import messaging_lib and config_lib
 current_dir = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, os.path.realpath(os.path.join(current_dir, os.pardir, os.pardir, 'lib')))
+sys.path.insert(0, os.path.realpath(os.path.join(current_dir, os.pardir, os.pardir)))
 
 # Import modules from lib dir
-import messaging
-from config import ConfigManager
+import lib.messaging as messaging
+from lib.config import ConfigManager
 
 random.seed()
 
diff --git a/server/modules/visual_land_dialog.py b/server/modules/visual_land_dialog.py
index 5c53d5f..af2945d 100644
--- a/server/modules/visual_land_dialog.py
+++ b/server/modules/visual_land_dialog.py
@@ -8,7 +8,7 @@ import logging
 import sys
 from functools import partial
 
-from lib import b_partial
+from lib.lib import b_partial
 
 #  TODO: previous step and reset
 class VisualLandDialog(QtWidgets.QDialog):
diff --git a/server/server.py b/server/server.py
index 3ef640d..03ebd21 100644
--- a/server/server.py
+++ b/server/server.py
@@ -16,9 +16,9 @@ from quamash import QEventLoop
 from modules.server_core import Server, Client, now
 
 # Import modules from lib, that was added to PATH on the previous step
-import messaging
-import config as cfg
-from lib import b_partial
+import lib.messaging as messaging
+import lib.config as cfg
+from lib.lib import b_partial
 
 # Import PyQt5 related functions
 from PyQt5 import QtWidgets, QtMultimedia, QtCore