diff --git a/kiauh/__init__.py b/kiauh/__init__.py
index 91fd073..f93f7de 100644
--- a/kiauh/__init__.py
+++ b/kiauh/__init__.py
@@ -9,7 +9,11 @@
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
 
+import sys
 from pathlib import Path
 
-APPLICATION_ROOT = Path(__file__).resolve().parent.parent
-KIAUH_CFG = APPLICATION_ROOT.joinpath("kiauh.cfg")
+PROJECT_ROOT = Path(__file__).resolve().parent.parent
+KIAUH_CFG = PROJECT_ROOT.joinpath("kiauh.cfg")
+
+APPLICATION_ROOT = Path(__file__).resolve().parent
+sys.path.append(str(APPLICATION_ROOT))
diff --git a/kiauh/components/klipper/__init__.py b/kiauh/components/klipper/__init__.py
index ff3ae20..9f46783 100644
--- a/kiauh/components/klipper/__init__.py
+++ b/kiauh/components/klipper/__init__.py
@@ -11,7 +11,7 @@
 
 from pathlib import Path
 
-from kiauh.core.backup_manager import BACKUP_ROOT_DIR
+from core.backup_manager import BACKUP_ROOT_DIR
 
 MODULE_PATH = Path(__file__).resolve().parent
 
diff --git a/kiauh/components/klipper/klipper.py b/kiauh/components/klipper/klipper.py
index 1b442c6..05eef56 100644
--- a/kiauh/components/klipper/klipper.py
+++ b/kiauh/components/klipper/klipper.py
@@ -13,10 +13,10 @@ import subprocess
 from pathlib import Path
 from typing import List
 
-from kiauh.components.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR, MODULE_PATH
-from kiauh.core.instance_manager.base_instance import BaseInstance
-from kiauh.utils.constants import SYSTEMD
-from kiauh.utils.logger import Logger
+from components.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR, MODULE_PATH
+from core.instance_manager.base_instance import BaseInstance
+from utils.constants import SYSTEMD
+from utils.logger import Logger
 
 
 # noinspection PyMethodMayBeStatic
diff --git a/kiauh/components/klipper/klipper_dialogs.py b/kiauh/components/klipper/klipper_dialogs.py
index 94e9374..30892c5 100644
--- a/kiauh/components/klipper/klipper_dialogs.py
+++ b/kiauh/components/klipper/klipper_dialogs.py
@@ -12,9 +12,9 @@
 import textwrap
 from typing import List
 
-from kiauh.core.instance_manager.base_instance import BaseInstance
-from kiauh.core.menus.base_menu import print_back_footer
-from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN
+from core.instance_manager.base_instance import BaseInstance
+from core.menus.base_menu import print_back_footer
+from utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN
 
 
 def print_instance_overview(
diff --git a/kiauh/components/klipper/klipper_remove.py b/kiauh/components/klipper/klipper_remove.py
index 61b007c..d802d4b 100644
--- a/kiauh/components/klipper/klipper_remove.py
+++ b/kiauh/components/klipper/klipper_remove.py
@@ -12,13 +12,13 @@
 import shutil
 from typing import List, Union
 
-from kiauh.components.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR
-from kiauh.components.klipper.klipper import Klipper
-from kiauh.components.klipper.klipper_dialogs import print_instance_overview
-from kiauh.core.instance_manager.instance_manager import InstanceManager
-from kiauh.utils.filesystem_utils import remove_file
-from kiauh.utils.input_utils import get_selection_input
-from kiauh.utils.logger import Logger
+from components.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR
+from components.klipper.klipper import Klipper
+from components.klipper.klipper_dialogs import print_instance_overview
+from core.instance_manager.instance_manager import InstanceManager
+from utils.filesystem_utils import remove_file
+from utils.input_utils import get_selection_input
+from utils.logger import Logger
 
 
 def run_klipper_removal(
diff --git a/kiauh/components/klipper/klipper_setup.py b/kiauh/components/klipper/klipper_setup.py
index 2cf5690..e9761e9 100644
--- a/kiauh/components/klipper/klipper_setup.py
+++ b/kiauh/components/klipper/klipper_setup.py
@@ -12,16 +12,16 @@
 from pathlib import Path
 
 from kiauh import KIAUH_CFG
-from kiauh.components.klipper import (
+from components.klipper import (
     EXIT_KLIPPER_SETUP,
     DEFAULT_KLIPPER_REPO_URL,
     KLIPPER_DIR,
     KLIPPER_ENV_DIR,
     KLIPPER_REQUIREMENTS_TXT,
 )
-from kiauh.components.klipper.klipper import Klipper
-from kiauh.components.klipper.klipper_dialogs import print_update_warn_dialog
-from kiauh.components.klipper.klipper_utils import (
+from components.klipper.klipper import Klipper
+from components.klipper.klipper_dialogs import print_update_warn_dialog
+from components.klipper.klipper_utils import (
     handle_disruptive_system_packages,
     check_user_groups,
     handle_to_multi_instance_conversion,
@@ -34,13 +34,13 @@ from kiauh.components.klipper.klipper_utils import (
     handle_instance_naming,
     backup_klipper_dir,
 )
-from kiauh.components.moonraker.moonraker import Moonraker
-from kiauh.core.config_manager.config_manager import ConfigManager
-from kiauh.core.instance_manager.instance_manager import InstanceManager
-from kiauh.core.repo_manager.repo_manager import RepoManager
-from kiauh.utils.input_utils import get_confirm
-from kiauh.utils.logger import Logger
-from kiauh.utils.system_utils import (
+from components.moonraker.moonraker import Moonraker
+from core.config_manager.config_manager import ConfigManager
+from core.instance_manager.instance_manager import InstanceManager
+from core.repo_manager.repo_manager import RepoManager
+from utils.input_utils import get_confirm
+from utils.logger import Logger
+from utils.system_utils import (
     parse_packages_from_file,
     create_python_venv,
     install_python_requirements,
diff --git a/kiauh/components/klipper/klipper_utils.py b/kiauh/components/klipper/klipper_utils.py
index 564d7f7..e2ff73a 100644
--- a/kiauh/components/klipper/klipper_utils.py
+++ b/kiauh/components/klipper/klipper_utils.py
@@ -18,32 +18,32 @@ import textwrap
 from pathlib import Path
 from typing import List, Union, Literal, Dict
 
-from kiauh.components.klipper import (
+from components.klipper import (
     MODULE_PATH,
     KLIPPER_DIR,
     KLIPPER_ENV_DIR,
     KLIPPER_BACKUP_DIR,
 )
-from kiauh.components.klipper.klipper import Klipper
-from kiauh.components.klipper.klipper_dialogs import (
+from components.klipper.klipper import Klipper
+from components.klipper.klipper_dialogs import (
     print_missing_usergroup_dialog,
     print_instance_overview,
     print_select_instance_count_dialog,
     print_select_custom_name_dialog,
 )
-from kiauh.components.moonraker.moonraker import Moonraker
-from kiauh.components.moonraker.moonraker_utils import moonraker_to_multi_conversion
-from kiauh.core.backup_manager.backup_manager import BackupManager
-from kiauh.core.config_manager.config_manager import ConfigManager
-from kiauh.core.instance_manager.base_instance import BaseInstance
-from kiauh.core.instance_manager.instance_manager import InstanceManager
-from kiauh.core.instance_manager.name_scheme import NameScheme
-from kiauh.core.repo_manager.repo_manager import RepoManager
-from kiauh.utils.common import get_install_status_common
-from kiauh.utils.constants import CURRENT_USER
-from kiauh.utils.input_utils import get_confirm, get_string_input, get_number_input
-from kiauh.utils.logger import Logger
-from kiauh.utils.system_utils import mask_system_service
+from components.moonraker.moonraker import Moonraker
+from components.moonraker.moonraker_utils import moonraker_to_multi_conversion
+from core.backup_manager.backup_manager import BackupManager
+from core.config_manager.config_manager import ConfigManager
+from core.instance_manager.base_instance import BaseInstance
+from core.instance_manager.instance_manager import InstanceManager
+from core.instance_manager.name_scheme import NameScheme
+from core.repo_manager.repo_manager import RepoManager
+from utils.common import get_install_status_common
+from utils.constants import CURRENT_USER
+from utils.input_utils import get_confirm, get_string_input, get_number_input
+from utils.logger import Logger
+from utils.system_utils import mask_system_service
 
 
 def get_klipper_status() -> Dict[
diff --git a/kiauh/components/klipper/menus/klipper_remove_menu.py b/kiauh/components/klipper/menus/klipper_remove_menu.py
index a36d51b..fc953ab 100644
--- a/kiauh/components/klipper/menus/klipper_remove_menu.py
+++ b/kiauh/components/klipper/menus/klipper_remove_menu.py
@@ -11,10 +11,10 @@
 
 import textwrap
 
-from kiauh.components.klipper import klipper_remove
-from kiauh.core.menus import BACK_HELP_FOOTER
-from kiauh.core.menus.base_menu import BaseMenu
-from kiauh.utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN
+from components.klipper import klipper_remove
+from core.menus import BACK_HELP_FOOTER
+from core.menus.base_menu import BaseMenu
+from utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN
 
 
 # noinspection PyUnusedLocal
diff --git a/kiauh/components/log_uploads/log_upload_utils.py b/kiauh/components/log_uploads/log_upload_utils.py
index 4247a0e..daa67e4 100644
--- a/kiauh/components/log_uploads/log_upload_utils.py
+++ b/kiauh/components/log_uploads/log_upload_utils.py
@@ -13,10 +13,10 @@ import urllib.request
 from pathlib import Path
 from typing import List
 
-from kiauh.components.klipper.klipper import Klipper
-from kiauh.components.log_uploads import LogFile
-from kiauh.core.instance_manager.instance_manager import InstanceManager
-from kiauh.utils.logger import Logger
+from components.klipper.klipper import Klipper
+from components.log_uploads import LogFile
+from core.instance_manager.instance_manager import InstanceManager
+from utils.logger import Logger
 
 
 def get_logfile_list() -> List[LogFile]:
diff --git a/kiauh/components/log_uploads/menus/log_upload_menu.py b/kiauh/components/log_uploads/menus/log_upload_menu.py
index 11bb65e..baccce5 100644
--- a/kiauh/components/log_uploads/menus/log_upload_menu.py
+++ b/kiauh/components/log_uploads/menus/log_upload_menu.py
@@ -11,11 +11,11 @@
 
 import textwrap
 
-from kiauh.components.log_uploads.log_upload_utils import get_logfile_list
-from kiauh.components.log_uploads.log_upload_utils import upload_logfile
-from kiauh.core.menus import BACK_FOOTER
-from kiauh.core.menus.base_menu import BaseMenu
-from kiauh.utils.constants import RESET_FORMAT, COLOR_YELLOW
+from components.log_uploads.log_upload_utils import get_logfile_list
+from components.log_uploads.log_upload_utils import upload_logfile
+from core.menus import BACK_FOOTER
+from core.menus.base_menu import BaseMenu
+from utils.constants import RESET_FORMAT, COLOR_YELLOW
 
 
 # noinspection PyMethodMayBeStatic
diff --git a/kiauh/components/mainsail/__init__.py b/kiauh/components/mainsail/__init__.py
index 0b2d2af..53a9924 100644
--- a/kiauh/components/mainsail/__init__.py
+++ b/kiauh/components/mainsail/__init__.py
@@ -11,7 +11,7 @@
 
 from pathlib import Path
 
-from kiauh.core.backup_manager import BACKUP_ROOT_DIR
+from core.backup_manager import BACKUP_ROOT_DIR
 
 MODULE_PATH = Path(__file__).resolve().parent
 MAINSAIL_DIR = Path.home().joinpath("mainsail")
diff --git a/kiauh/components/mainsail/mainsail_dialogs.py b/kiauh/components/mainsail/mainsail_dialogs.py
index 6c8ea69..36453ff 100644
--- a/kiauh/components/mainsail/mainsail_dialogs.py
+++ b/kiauh/components/mainsail/mainsail_dialogs.py
@@ -11,8 +11,8 @@
 
 import textwrap
 
-from kiauh.core.menus.base_menu import print_back_footer
-from kiauh.utils.constants import RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN
+from core.menus.base_menu import print_back_footer
+from utils.constants import RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN
 
 
 def print_moonraker_not_found_dialog():
diff --git a/kiauh/components/mainsail/mainsail_remove.py b/kiauh/components/mainsail/mainsail_remove.py
index 3a4f797..204e8a6 100644
--- a/kiauh/components/mainsail/mainsail_remove.py
+++ b/kiauh/components/mainsail/mainsail_remove.py
@@ -15,15 +15,15 @@ import subprocess
 from pathlib import Path
 from typing import List
 
-from kiauh.components.klipper.klipper import Klipper
-from kiauh.components.mainsail import MAINSAIL_DIR, MAINSAIL_CONFIG_DIR
-from kiauh.components.mainsail.mainsail_utils import backup_config_json
-from kiauh.components.moonraker.moonraker import Moonraker
-from kiauh.core.config_manager.config_manager import ConfigManager
-from kiauh.core.instance_manager.instance_manager import InstanceManager
-from kiauh.utils import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED
-from kiauh.utils.filesystem_utils import remove_file
-from kiauh.utils.logger import Logger
+from components.klipper.klipper import Klipper
+from components.mainsail import MAINSAIL_DIR, MAINSAIL_CONFIG_DIR
+from components.mainsail.mainsail_utils import backup_config_json
+from components.moonraker.moonraker import Moonraker
+from core.config_manager.config_manager import ConfigManager
+from core.instance_manager.instance_manager import InstanceManager
+from utils import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED
+from utils.filesystem_utils import remove_file
+from utils.logger import Logger
 
 
 def run_mainsail_removal(
diff --git a/kiauh/components/mainsail/mainsail_setup.py b/kiauh/components/mainsail/mainsail_setup.py
index e370847..210dc9e 100644
--- a/kiauh/components/mainsail/mainsail_setup.py
+++ b/kiauh/components/mainsail/mainsail_setup.py
@@ -14,33 +14,33 @@ from pathlib import Path
 from typing import List
 
 from kiauh import KIAUH_CFG
-from kiauh.components.klipper.klipper import Klipper
-from kiauh.components.mainsail import (
+from components.klipper.klipper import Klipper
+from components.mainsail import (
     MAINSAIL_URL,
     MAINSAIL_DIR,
     MAINSAIL_CONFIG_DIR,
     MAINSAIL_CONFIG_REPO_URL,
     MODULE_PATH,
 )
-from kiauh.components.mainsail.mainsail_dialogs import (
+from components.mainsail.mainsail_dialogs import (
     print_moonraker_not_found_dialog,
     print_mainsail_already_installed_dialog,
     print_install_mainsail_config_dialog,
     print_mainsail_port_select_dialog,
 )
-from kiauh.components.mainsail.mainsail_utils import (
+from components.mainsail.mainsail_utils import (
     restore_config_json,
     enable_mainsail_remotemode,
     backup_config_json,
     symlink_webui_nginx_log,
 )
-from kiauh.components.moonraker.moonraker import Moonraker
-from kiauh.core.config_manager.config_manager import ConfigManager
-from kiauh.core.instance_manager.instance_manager import InstanceManager
-from kiauh.core.repo_manager.repo_manager import RepoManager
-from kiauh.utils import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED
-from kiauh.utils.common import check_install_dependencies
-from kiauh.utils.filesystem_utils import (
+from components.moonraker.moonraker import Moonraker
+from core.config_manager.config_manager import ConfigManager
+from core.instance_manager.instance_manager import InstanceManager
+from core.repo_manager.repo_manager import RepoManager
+from utils import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED
+from utils.common import check_install_dependencies
+from utils.filesystem_utils import (
     unzip,
     copy_upstream_nginx_cfg,
     copy_common_vars_nginx_cfg,
@@ -48,9 +48,9 @@ from kiauh.utils.filesystem_utils import (
     create_symlink,
     remove_file,
 )
-from kiauh.utils.input_utils import get_confirm, get_number_input
-from kiauh.utils.logger import Logger
-from kiauh.utils.system_utils import (
+from utils.input_utils import get_confirm, get_number_input
+from utils.logger import Logger
+from utils.system_utils import (
     download_file,
     set_nginx_permissions,
     get_ipv4_addr,
diff --git a/kiauh/components/mainsail/mainsail_utils.py b/kiauh/components/mainsail/mainsail_utils.py
index b2aa32b..321f326 100644
--- a/kiauh/components/mainsail/mainsail_utils.py
+++ b/kiauh/components/mainsail/mainsail_utils.py
@@ -17,16 +17,16 @@ from typing import List
 
 import urllib.request
 
-from kiauh.components.klipper.klipper import Klipper
-from kiauh.components.mainsail import (
+from components.klipper.klipper import Klipper
+from components.mainsail import (
     MAINSAIL_CONFIG_JSON,
     MAINSAIL_DIR,
     MAINSAIL_BACKUP_DIR,
 )
-from kiauh.core.backup_manager.backup_manager import BackupManager
-from kiauh.utils import NGINX_SITES_AVAILABLE, NGINX_CONFD
-from kiauh.utils.common import get_install_status_webui
-from kiauh.utils.logger import Logger
+from core.backup_manager.backup_manager import BackupManager
+from utils import NGINX_SITES_AVAILABLE, NGINX_CONFD
+from utils.common import get_install_status_webui
+from utils.logger import Logger
 
 
 def get_mainsail_status() -> str:
diff --git a/kiauh/components/mainsail/menus/mainsail_remove_menu.py b/kiauh/components/mainsail/menus/mainsail_remove_menu.py
index 187d974..48cfb4b 100644
--- a/kiauh/components/mainsail/menus/mainsail_remove_menu.py
+++ b/kiauh/components/mainsail/menus/mainsail_remove_menu.py
@@ -11,10 +11,10 @@
 
 import textwrap
 
-from kiauh.components.mainsail import mainsail_remove
-from kiauh.core.menus import BACK_HELP_FOOTER
-from kiauh.core.menus.base_menu import BaseMenu
-from kiauh.utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN
+from components.mainsail import mainsail_remove
+from core.menus import BACK_HELP_FOOTER
+from core.menus.base_menu import BaseMenu
+from utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN
 
 
 # noinspection PyUnusedLocal
diff --git a/kiauh/components/moonraker/__init__.py b/kiauh/components/moonraker/__init__.py
index e42f3e9..9341992 100644
--- a/kiauh/components/moonraker/__init__.py
+++ b/kiauh/components/moonraker/__init__.py
@@ -11,7 +11,7 @@
 
 from pathlib import Path
 
-from kiauh.core.backup_manager import BACKUP_ROOT_DIR
+from core.backup_manager import BACKUP_ROOT_DIR
 
 MODULE_PATH = Path(__file__).resolve().parent
 
diff --git a/kiauh/components/moonraker/menus/moonraker_remove_menu.py b/kiauh/components/moonraker/menus/moonraker_remove_menu.py
index 962e07d..652d028 100644
--- a/kiauh/components/moonraker/menus/moonraker_remove_menu.py
+++ b/kiauh/components/moonraker/menus/moonraker_remove_menu.py
@@ -11,10 +11,10 @@
 
 import textwrap
 
-from kiauh.components.moonraker import moonraker_remove
-from kiauh.core.menus import BACK_HELP_FOOTER
-from kiauh.core.menus.base_menu import BaseMenu
-from kiauh.utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN
+from components.moonraker import moonraker_remove
+from core.menus import BACK_HELP_FOOTER
+from core.menus.base_menu import BaseMenu
+from utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN
 
 
 # noinspection PyUnusedLocal
diff --git a/kiauh/components/moonraker/moonraker.py b/kiauh/components/moonraker/moonraker.py
index c2a9d29..aa0e03b 100644
--- a/kiauh/components/moonraker/moonraker.py
+++ b/kiauh/components/moonraker/moonraker.py
@@ -13,11 +13,11 @@ import subprocess
 from pathlib import Path
 from typing import List, Union
 
-from kiauh.components.moonraker import MOONRAKER_DIR, MOONRAKER_ENV_DIR, MODULE_PATH
-from kiauh.core.config_manager.config_manager import ConfigManager
-from kiauh.core.instance_manager.base_instance import BaseInstance
-from kiauh.utils.constants import SYSTEMD
-from kiauh.utils.logger import Logger
+from components.moonraker import MOONRAKER_DIR, MOONRAKER_ENV_DIR, MODULE_PATH
+from core.config_manager.config_manager import ConfigManager
+from core.instance_manager.base_instance import BaseInstance
+from utils.constants import SYSTEMD
+from utils.logger import Logger
 
 
 # noinspection PyMethodMayBeStatic
diff --git a/kiauh/components/moonraker/moonraker_dialogs.py b/kiauh/components/moonraker/moonraker_dialogs.py
index 2bc18b2..4f13d10 100644
--- a/kiauh/components/moonraker/moonraker_dialogs.py
+++ b/kiauh/components/moonraker/moonraker_dialogs.py
@@ -12,10 +12,10 @@
 import textwrap
 from typing import List
 
-from kiauh.components.klipper.klipper import Klipper
-from kiauh.components.moonraker.moonraker import Moonraker
-from kiauh.core.menus.base_menu import print_back_footer
-from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN
+from components.klipper.klipper import Klipper
+from components.moonraker.moonraker import Moonraker
+from core.menus.base_menu import print_back_footer
+from utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN
 
 
 def print_moonraker_overview(
diff --git a/kiauh/components/moonraker/moonraker_remove.py b/kiauh/components/moonraker/moonraker_remove.py
index 02af9dd..db10bf4 100644
--- a/kiauh/components/moonraker/moonraker_remove.py
+++ b/kiauh/components/moonraker/moonraker_remove.py
@@ -13,13 +13,13 @@ import shutil
 import subprocess
 from typing import List, Union
 
-from kiauh.components.klipper.klipper_dialogs import print_instance_overview
-from kiauh.components.moonraker import MOONRAKER_DIR, MOONRAKER_ENV_DIR
-from kiauh.components.moonraker.moonraker import Moonraker
-from kiauh.core.instance_manager.instance_manager import InstanceManager
-from kiauh.utils.filesystem_utils import remove_file
-from kiauh.utils.input_utils import get_selection_input
-from kiauh.utils.logger import Logger
+from components.klipper.klipper_dialogs import print_instance_overview
+from components.moonraker import MOONRAKER_DIR, MOONRAKER_ENV_DIR
+from components.moonraker.moonraker import Moonraker
+from core.instance_manager.instance_manager import InstanceManager
+from utils.filesystem_utils import remove_file
+from utils.input_utils import get_selection_input
+from utils.logger import Logger
 
 
 def run_moonraker_removal(
diff --git a/kiauh/components/moonraker/moonraker_setup.py b/kiauh/components/moonraker/moonraker_setup.py
index f041a0e..fe635f8 100644
--- a/kiauh/components/moonraker/moonraker_setup.py
+++ b/kiauh/components/moonraker/moonraker_setup.py
@@ -15,11 +15,11 @@ from pathlib import Path
 from typing import List
 
 from kiauh import KIAUH_CFG
-from kiauh.components.klipper.klipper import Klipper
-from kiauh.components.klipper.klipper_dialogs import print_instance_overview
-from kiauh.components.mainsail import MAINSAIL_DIR
-from kiauh.components.mainsail.mainsail_utils import enable_mainsail_remotemode
-from kiauh.components.moonraker import (
+from components.klipper.klipper import Klipper
+from components.klipper.klipper_dialogs import print_instance_overview
+from components.mainsail import MAINSAIL_DIR
+from components.mainsail.mainsail_utils import enable_mainsail_remotemode
+from components.moonraker import (
     EXIT_MOONRAKER_SETUP,
     DEFAULT_MOONRAKER_REPO_URL,
     MOONRAKER_DIR,
@@ -30,22 +30,22 @@ from kiauh.components.moonraker import (
     POLKIT_USR_FILE,
     POLKIT_SCRIPT,
 )
-from kiauh.components.moonraker.moonraker import Moonraker
-from kiauh.components.moonraker.moonraker_dialogs import print_moonraker_overview
-from kiauh.components.moonraker.moonraker_utils import (
+from components.moonraker.moonraker import Moonraker
+from components.moonraker.moonraker_dialogs import print_moonraker_overview
+from components.moonraker.moonraker_utils import (
     create_example_moonraker_conf,
     backup_moonraker_dir,
 )
-from kiauh.core.config_manager.config_manager import ConfigManager
-from kiauh.core.instance_manager.instance_manager import InstanceManager
-from kiauh.core.repo_manager.repo_manager import RepoManager
-from kiauh.utils.filesystem_utils import check_file_exist
-from kiauh.utils.input_utils import (
+from core.config_manager.config_manager import ConfigManager
+from core.instance_manager.instance_manager import InstanceManager
+from core.repo_manager.repo_manager import RepoManager
+from utils.filesystem_utils import check_file_exist
+from utils.input_utils import (
     get_confirm,
     get_selection_input,
 )
-from kiauh.utils.logger import Logger
-from kiauh.utils.system_utils import (
+from utils.logger import Logger
+from utils.system_utils import (
     parse_packages_from_file,
     create_python_venv,
     install_python_requirements,
diff --git a/kiauh/components/moonraker/moonraker_utils.py b/kiauh/components/moonraker/moonraker_utils.py
index 0a9ae11..3321781 100644
--- a/kiauh/components/moonraker/moonraker_utils.py
+++ b/kiauh/components/moonraker/moonraker_utils.py
@@ -12,9 +12,9 @@
 import shutil
 from typing import Dict, Literal, List, Union
 
-from kiauh.components.mainsail import MAINSAIL_DIR
-from kiauh.components.mainsail.mainsail_utils import enable_mainsail_remotemode
-from kiauh.components.moonraker import (
+from components.mainsail import MAINSAIL_DIR
+from components.mainsail.mainsail_utils import enable_mainsail_remotemode
+from components.moonraker import (
     DEFAULT_MOONRAKER_PORT,
     MODULE_PATH,
     MOONRAKER_DIR,
@@ -22,14 +22,14 @@ from kiauh.components.moonraker import (
     MOONRAKER_BACKUP_DIR,
     MOONRAKER_DB_BACKUP_DIR,
 )
-from kiauh.components.moonraker.moonraker import Moonraker
-from kiauh.core.backup_manager.backup_manager import BackupManager
-from kiauh.core.config_manager.config_manager import ConfigManager
-from kiauh.core.instance_manager.instance_manager import InstanceManager
-from kiauh.core.repo_manager.repo_manager import RepoManager
-from kiauh.utils.common import get_install_status_common
-from kiauh.utils.logger import Logger
-from kiauh.utils.system_utils import (
+from components.moonraker.moonraker import Moonraker
+from core.backup_manager.backup_manager import BackupManager
+from core.config_manager.config_manager import ConfigManager
+from core.instance_manager.instance_manager import InstanceManager
+from core.repo_manager.repo_manager import RepoManager
+from utils.common import get_install_status_common
+from utils.logger import Logger
+from utils.system_utils import (
     get_ipv4_addr,
 )
 
diff --git a/kiauh/core/backup_manager/backup_manager.py b/kiauh/core/backup_manager/backup_manager.py
index 8f2dbcf..1c27266 100644
--- a/kiauh/core/backup_manager/backup_manager.py
+++ b/kiauh/core/backup_manager/backup_manager.py
@@ -13,9 +13,9 @@ import shutil
 from pathlib import Path
 from typing import List
 
-from kiauh.core.backup_manager import BACKUP_ROOT_DIR
-from kiauh.utils.common import get_current_date
-from kiauh.utils.logger import Logger
+from core.backup_manager import BACKUP_ROOT_DIR
+from utils.common import get_current_date
+from utils.logger import Logger
 
 
 # noinspection PyUnusedLocal
diff --git a/kiauh/core/config_manager/config_manager.py b/kiauh/core/config_manager/config_manager.py
index 63a4490..12d4eb0 100644
--- a/kiauh/core/config_manager/config_manager.py
+++ b/kiauh/core/config_manager/config_manager.py
@@ -13,7 +13,7 @@ import configparser
 from pathlib import Path
 from typing import Union
 
-from kiauh.utils.logger import Logger
+from utils.logger import Logger
 
 
 # noinspection PyMethodMayBeStatic
diff --git a/kiauh/core/instance_manager/base_instance.py b/kiauh/core/instance_manager/base_instance.py
index 571985e..95e24dc 100644
--- a/kiauh/core/instance_manager/base_instance.py
+++ b/kiauh/core/instance_manager/base_instance.py
@@ -13,7 +13,7 @@ from abc import abstractmethod, ABC
 from pathlib import Path
 from typing import List, Type, TypeVar
 
-from kiauh.utils.constants import SYSTEMD, CURRENT_USER
+from utils.constants import SYSTEMD, CURRENT_USER
 
 B = TypeVar(name="B", bound="BaseInstance", covariant=True)
 
diff --git a/kiauh/core/instance_manager/instance_manager.py b/kiauh/core/instance_manager/instance_manager.py
index 0a920d6..9750086 100644
--- a/kiauh/core/instance_manager/instance_manager.py
+++ b/kiauh/core/instance_manager/instance_manager.py
@@ -14,9 +14,9 @@ import subprocess
 from pathlib import Path
 from typing import List, Optional, Union, TypeVar
 
-from kiauh.core.instance_manager.base_instance import BaseInstance
-from kiauh.utils.constants import SYSTEMD
-from kiauh.utils.logger import Logger
+from core.instance_manager.base_instance import BaseInstance
+from utils.constants import SYSTEMD
+from utils.logger import Logger
 
 I = TypeVar(name="I", bound=BaseInstance, covariant=True)
 
diff --git a/kiauh/core/menus/advanced_menu.py b/kiauh/core/menus/advanced_menu.py
index 533b5c1..27eaacd 100644
--- a/kiauh/core/menus/advanced_menu.py
+++ b/kiauh/core/menus/advanced_menu.py
@@ -11,9 +11,9 @@
 
 import textwrap
 
-from kiauh.core.menus import BACK_FOOTER
-from kiauh.core.menus.base_menu import BaseMenu
-from kiauh.utils.constants import COLOR_YELLOW, RESET_FORMAT
+from core.menus import BACK_FOOTER
+from core.menus.base_menu import BaseMenu
+from utils.constants import COLOR_YELLOW, RESET_FORMAT
 
 
 class AdvancedMenu(BaseMenu):
diff --git a/kiauh/core/menus/backup_menu.py b/kiauh/core/menus/backup_menu.py
index 184e26c..8b92978 100644
--- a/kiauh/core/menus/backup_menu.py
+++ b/kiauh/core/menus/backup_menu.py
@@ -11,16 +11,16 @@
 
 import textwrap
 
-from kiauh.components.klipper.klipper_utils import backup_klipper_dir
-from kiauh.components.mainsail.mainsail_utils import backup_mainsail_data
-from kiauh.components.moonraker.moonraker_utils import (
+from components.klipper.klipper_utils import backup_klipper_dir
+from components.mainsail.mainsail_utils import backup_mainsail_data
+from components.moonraker.moonraker_utils import (
     backup_moonraker_dir,
     backup_moonraker_db_dir,
 )
-from kiauh.core.menus import BACK_FOOTER
-from kiauh.core.menus.base_menu import BaseMenu
-from kiauh.utils.common import backup_printer_config_dir
-from kiauh.utils.constants import COLOR_CYAN, RESET_FORMAT, COLOR_YELLOW
+from core.menus import BACK_FOOTER
+from core.menus.base_menu import BaseMenu
+from utils.common import backup_printer_config_dir
+from utils.constants import COLOR_CYAN, RESET_FORMAT, COLOR_YELLOW
 
 
 # noinspection PyUnusedLocal
diff --git a/kiauh/core/menus/base_menu.py b/kiauh/core/menus/base_menu.py
index 89ed09b..06ad576 100644
--- a/kiauh/core/menus/base_menu.py
+++ b/kiauh/core/menus/base_menu.py
@@ -15,15 +15,15 @@ import textwrap
 from abc import abstractmethod, ABC
 from typing import Dict, Any, Literal, Union, Callable
 
-from kiauh.core.menus import QUIT_FOOTER, BACK_FOOTER, BACK_HELP_FOOTER
-from kiauh.utils.constants import (
+from core.menus import QUIT_FOOTER, BACK_FOOTER, BACK_HELP_FOOTER
+from utils.constants import (
     COLOR_GREEN,
     COLOR_YELLOW,
     COLOR_RED,
     COLOR_CYAN,
     RESET_FORMAT,
 )
-from kiauh.utils.logger import Logger
+from utils.logger import Logger
 
 
 def clear():
diff --git a/kiauh/core/menus/extensions_menu.py b/kiauh/core/menus/extensions_menu.py
index 50fd53b..a46b00c 100644
--- a/kiauh/core/menus/extensions_menu.py
+++ b/kiauh/core/menus/extensions_menu.py
@@ -16,10 +16,10 @@ import textwrap
 from pathlib import Path
 from typing import List, Dict
 
-from kiauh.core.base_extension import BaseExtension
-from kiauh.core.menus import BACK_FOOTER
-from kiauh.core.menus.base_menu import BaseMenu
-from kiauh.utils.constants import RESET_FORMAT, COLOR_CYAN, COLOR_YELLOW
+from core.base_extension import BaseExtension
+from core.menus import BACK_FOOTER
+from core.menus.base_menu import BaseMenu
+from utils.constants import RESET_FORMAT, COLOR_CYAN, COLOR_YELLOW
 
 
 # noinspection PyUnusedLocal
diff --git a/kiauh/core/menus/install_menu.py b/kiauh/core/menus/install_menu.py
index 85e1ef3..8ab2730 100644
--- a/kiauh/core/menus/install_menu.py
+++ b/kiauh/core/menus/install_menu.py
@@ -11,12 +11,13 @@
 
 import textwrap
 
-from kiauh.components.klipper import klipper_setup
-from kiauh.components.mainsail import mainsail_setup
-from kiauh.components.moonraker import moonraker_setup
-from kiauh.core.menus import BACK_FOOTER
-from kiauh.core.menus.base_menu import BaseMenu
-from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT
+from components.fluidd import fluidd_setup
+from components.klipper import klipper_setup
+from components.mainsail import mainsail_setup
+from components.moonraker import moonraker_setup
+from core.menus import BACK_FOOTER
+from core.menus.base_menu import BaseMenu
+from utils.constants import COLOR_GREEN, RESET_FORMAT
 
 
 # noinspection PyUnusedLocal
diff --git a/kiauh/core/menus/remove_menu.py b/kiauh/core/menus/remove_menu.py
index 1bd2eba..3fd94b9 100644
--- a/kiauh/core/menus/remove_menu.py
+++ b/kiauh/core/menus/remove_menu.py
@@ -11,12 +11,12 @@
 
 import textwrap
 
-from kiauh.components.klipper.menus.klipper_remove_menu import KlipperRemoveMenu
-from kiauh.components.mainsail.menus.mainsail_remove_menu import MainsailRemoveMenu
-from kiauh.components.moonraker.menus.moonraker_remove_menu import MoonrakerRemoveMenu
-from kiauh.core.menus import BACK_FOOTER
-from kiauh.core.menus.base_menu import BaseMenu
-from kiauh.utils.constants import COLOR_RED, RESET_FORMAT
+from components.klipper.menus.klipper_remove_menu import KlipperRemoveMenu
+from components.mainsail.menus.mainsail_remove_menu import MainsailRemoveMenu
+from components.moonraker.menus.moonraker_remove_menu import MoonrakerRemoveMenu
+from core.menus import BACK_FOOTER
+from core.menus.base_menu import BaseMenu
+from utils.constants import COLOR_RED, RESET_FORMAT
 
 
 # noinspection PyUnusedLocal
diff --git a/kiauh/core/menus/settings_menu.py b/kiauh/core/menus/settings_menu.py
index 1305ad1..66f352c 100644
--- a/kiauh/core/menus/settings_menu.py
+++ b/kiauh/core/menus/settings_menu.py
@@ -9,7 +9,7 @@
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
 
-from kiauh.core.menus.base_menu import BaseMenu
+from core.menus.base_menu import BaseMenu
 
 
 # noinspection PyMethodMayBeStatic
diff --git a/kiauh/core/repo_manager/repo_manager.py b/kiauh/core/repo_manager/repo_manager.py
index 9134694..a8f9eec 100644
--- a/kiauh/core/repo_manager/repo_manager.py
+++ b/kiauh/core/repo_manager/repo_manager.py
@@ -13,8 +13,8 @@ import shutil
 import subprocess
 from pathlib import Path
 
-from kiauh.utils.input_utils import get_confirm
-from kiauh.utils.logger import Logger
+from utils.input_utils import get_confirm
+from utils.logger import Logger
 
 
 # noinspection PyMethodMayBeStatic
diff --git a/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py b/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py
index a9798e2..bf0a977 100644
--- a/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py
+++ b/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py
@@ -13,21 +13,21 @@ import os
 import shutil
 from typing import List
 
-from kiauh.components.klipper.klipper import Klipper
-from kiauh.core.backup_manager.backup_manager import BackupManager
-from kiauh.core.base_extension import BaseExtension
-from kiauh.core.config_manager.config_manager import ConfigManager
-from kiauh.core.instance_manager.instance_manager import InstanceManager
-from kiauh.extensions.gcode_shell_cmd import (
+from components.klipper.klipper import Klipper
+from core.backup_manager.backup_manager import BackupManager
+from core.base_extension import BaseExtension
+from core.config_manager.config_manager import ConfigManager
+from core.instance_manager.instance_manager import InstanceManager
+from extensions.gcode_shell_cmd import (
     EXTENSION_TARGET_PATH,
     EXTENSION_SRC,
     KLIPPER_DIR,
     EXAMPLE_CFG_SRC,
     KLIPPER_EXTRAS,
 )
-from kiauh.utils.filesystem_utils import check_file_exist
-from kiauh.utils.input_utils import get_confirm
-from kiauh.utils.logger import Logger
+from utils.filesystem_utils import check_file_exist
+from utils.input_utils import get_confirm
+from utils.logger import Logger
 
 
 # noinspection PyMethodMayBeStatic
diff --git a/kiauh/main.py b/kiauh/main.py
index 0dd1b31..0ca361c 100644
--- a/kiauh/main.py
+++ b/kiauh/main.py
@@ -9,8 +9,8 @@
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
 
-from kiauh.core.menus.main_menu import MainMenu
-from kiauh.utils.logger import Logger
+from core.menus.main_menu import MainMenu
+from utils.logger import Logger
 
 
 def main():
diff --git a/kiauh/utils/__init__.py b/kiauh/utils/__init__.py
index 319fc15..afc69aa 100644
--- a/kiauh/utils/__init__.py
+++ b/kiauh/utils/__init__.py
@@ -11,7 +11,7 @@
 
 from pathlib import Path
 
-from kiauh.core.backup_manager import BACKUP_ROOT_DIR
+from core.backup_manager import BACKUP_ROOT_DIR
 
 MODULE_PATH = Path(__file__).resolve().parent
 INVALID_CHOICE = "Invalid choice. Please select a valid value."
diff --git a/kiauh/utils/common.py b/kiauh/utils/common.py
index 6557cd0..4e5bbee 100644
--- a/kiauh/utils/common.py
+++ b/kiauh/utils/common.py
@@ -13,20 +13,20 @@ from datetime import datetime
 from pathlib import Path
 from typing import Dict, Literal, List, Type, Union
 
-from kiauh.components.klipper.klipper import Klipper
-from kiauh.core.instance_manager.base_instance import BaseInstance
-from kiauh.core.instance_manager.instance_manager import InstanceManager
-from kiauh.utils import PRINTER_CFG_BACKUP_DIR
-from kiauh.utils.constants import (
+from components.klipper.klipper import Klipper
+from core.instance_manager.base_instance import BaseInstance
+from core.instance_manager.instance_manager import InstanceManager
+from utils import PRINTER_CFG_BACKUP_DIR
+from utils.constants import (
     COLOR_CYAN,
     RESET_FORMAT,
     COLOR_YELLOW,
     COLOR_GREEN,
     COLOR_RED,
 )
-from kiauh.utils.filesystem_utils import check_file_exist
-from kiauh.utils.logger import Logger
-from kiauh.utils.system_utils import check_package_install, install_system_packages
+from utils.filesystem_utils import check_file_exist
+from utils.logger import Logger
+from utils.system_utils import check_package_install, install_system_packages
 
 
 def get_current_date() -> Dict[Literal["date", "time"], str]:
@@ -122,7 +122,7 @@ def get_install_status_webui(
 
 def backup_printer_config_dir():
     # local import to prevent circular import
-    from kiauh.core.backup_manager.backup_manager import BackupManager
+    from core.backup_manager.backup_manager import BackupManager
 
     im = InstanceManager(Klipper)
     instances: List[Klipper] = im.instances
diff --git a/kiauh/utils/filesystem_utils.py b/kiauh/utils/filesystem_utils.py
index 68ce432..57b414f 100644
--- a/kiauh/utils/filesystem_utils.py
+++ b/kiauh/utils/filesystem_utils.py
@@ -13,12 +13,12 @@ import subprocess
 from pathlib import Path
 from zipfile import ZipFile
 
-from kiauh.utils import (
+from utils import (
     NGINX_SITES_AVAILABLE,
     MODULE_PATH,
     NGINX_CONFD,
 )
-from kiauh.utils.logger import Logger
+from utils.logger import Logger
 
 
 def check_file_exist(file_path: Path, sudo=False) -> bool:
diff --git a/kiauh/utils/input_utils.py b/kiauh/utils/input_utils.py
index e2daf8e..d0a3b48 100644
--- a/kiauh/utils/input_utils.py
+++ b/kiauh/utils/input_utils.py
@@ -11,9 +11,9 @@
 
 from typing import Optional, List, Union
 
-from kiauh.utils import INVALID_CHOICE
-from kiauh.utils.constants import COLOR_CYAN, RESET_FORMAT
-from kiauh.utils.logger import Logger
+from utils import INVALID_CHOICE
+from utils.constants import COLOR_CYAN, RESET_FORMAT
+from utils.logger import Logger
 
 
 def get_confirm(
diff --git a/kiauh/utils/logger.py b/kiauh/utils/logger.py
index fcd0c9b..66f9326 100644
--- a/kiauh/utils/logger.py
+++ b/kiauh/utils/logger.py
@@ -9,7 +9,7 @@
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
 
-from kiauh.utils.constants import (
+from utils.constants import (
     COLOR_WHITE,
     COLOR_GREEN,
     COLOR_YELLOW,
diff --git a/kiauh/utils/system_utils.py b/kiauh/utils/system_utils.py
index 352d575..718607a 100644
--- a/kiauh/utils/system_utils.py
+++ b/kiauh/utils/system_utils.py
@@ -21,9 +21,9 @@ import venv
 from pathlib import Path
 from typing import List, Literal
 
-from kiauh.utils.input_utils import get_confirm
-from kiauh.utils.logger import Logger
-from kiauh.utils.filesystem_utils import check_file_exist
+from utils.input_utils import get_confirm
+from utils.logger import Logger
+from utils.filesystem_utils import check_file_exist
 
 
 def kill(opt_err_msg: str = "") -> None: