From 9e5abe8014125d359c7698f962db8f7ac4476339 Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Sun, 11 Aug 2024 13:31:55 -0400
Subject: [PATCH] Refactor helpers to own directory

---
 app/classes/controllers/management_controller.py             | 2 +-
 app/classes/controllers/roles_controller.py                  | 2 +-
 app/classes/controllers/servers_controller.py                | 4 ++--
 app/classes/{shared => helpers}/file_helpers.py              | 2 +-
 app/classes/{shared => helpers}/helpers.py                   | 0
 app/classes/minecraft/bigbucket.py                           | 2 +-
 app/classes/minecraft/stats.py                               | 2 +-
 app/classes/models/management.py                             | 2 +-
 app/classes/models/roles.py                                  | 2 +-
 app/classes/models/server_stats.py                           | 2 +-
 app/classes/models/servers.py                                | 2 +-
 app/classes/models/users.py                                  | 2 +-
 app/classes/shared/backup_mgr.py                             | 2 +-
 app/classes/shared/command.py                                | 2 +-
 app/classes/shared/import_helper.py                          | 4 ++--
 app/classes/shared/main_controller.py                        | 4 ++--
 app/classes/shared/main_models.py                            | 2 +-
 app/classes/shared/migration.py                              | 2 +-
 app/classes/shared/server.py                                 | 5 ++---
 app/classes/shared/tasks.py                                  | 4 ++--
 app/classes/web/base_handler.py                              | 4 ++--
 app/classes/web/panel_handler.py                             | 2 +-
 app/classes/web/public_handler.py                            | 2 +-
 app/classes/web/routes/api/auth/invalidate_tokens.py         | 2 +-
 app/classes/web/routes/api/auth/login.py                     | 2 +-
 app/classes/web/routes/api/crafty/config/index.py            | 2 +-
 app/classes/web/routes/api/crafty/imports/index.py           | 2 +-
 app/classes/web/routes/api/crafty/upload/index.py            | 2 +-
 app/classes/web/routes/api/servers/server/action.py          | 2 +-
 .../web/routes/api/servers/server/backups/backup/index.py    | 4 ++--
 app/classes/web/routes/api/servers/server/files.py           | 4 ++--
 app/classes/web/server_handler.py                            | 2 +-
 app/classes/web/static_handler.py                            | 2 +-
 app/classes/web/tornado_handler.py                           | 4 ++--
 app/classes/web/webhooks/base_webhook.py                     | 2 +-
 app/classes/web/websocket_handler.py                         | 2 +-
 app/migrations/20211120221511_api_keys.py                    | 2 +-
 app/migrations/20240308_multi-backup.py                      | 4 ++--
 main.py                                                      | 4 ++--
 39 files changed, 49 insertions(+), 50 deletions(-)
 rename app/classes/{shared => helpers}/file_helpers.py (99%)
 rename app/classes/{shared => helpers}/helpers.py (100%)

diff --git a/app/classes/controllers/management_controller.py b/app/classes/controllers/management_controller.py
index fc17b8be..b397a321 100644
--- a/app/classes/controllers/management_controller.py
+++ b/app/classes/controllers/management_controller.py
@@ -5,7 +5,7 @@ from prometheus_client import CollectorRegistry, Gauge
 
 from app.classes.models.management import HelpersManagement, HelpersWebhooks
 from app.classes.models.servers import HelperServers
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 
 logger = logging.getLogger(__name__)
 
diff --git a/app/classes/controllers/roles_controller.py b/app/classes/controllers/roles_controller.py
index ab5dcd5a..dc9f17f8 100644
--- a/app/classes/controllers/roles_controller.py
+++ b/app/classes/controllers/roles_controller.py
@@ -3,7 +3,7 @@ import typing as t
 
 from app.classes.models.roles import HelperRoles
 from app.classes.models.server_permissions import PermissionsServers, RoleServers
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 
 logger = logging.getLogger(__name__)
 
diff --git a/app/classes/controllers/servers_controller.py b/app/classes/controllers/servers_controller.py
index ec699fa5..64e82d2b 100644
--- a/app/classes/controllers/servers_controller.py
+++ b/app/classes/controllers/servers_controller.py
@@ -6,13 +6,13 @@ import pathlib
 import typing as t
 
 from app.classes.controllers.roles_controller import RolesController
-from app.classes.shared.file_helpers import FileHelpers
+from app.classes.helpers.file_helpers import FileHelpers
 
 from app.classes.shared.singleton import Singleton
 from app.classes.shared.server import ServerInstance
 from app.classes.shared.console import Console
 from app.classes.shared.backup_mgr import BackupManager
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.shared.main_models import DatabaseShortcuts
 
 from app.classes.minecraft.stats import Stats
diff --git a/app/classes/shared/file_helpers.py b/app/classes/helpers/file_helpers.py
similarity index 99%
rename from app/classes/shared/file_helpers.py
rename to app/classes/helpers/file_helpers.py
index 8069e26e..5d7b335d 100644
--- a/app/classes/shared/file_helpers.py
+++ b/app/classes/helpers/file_helpers.py
@@ -14,7 +14,7 @@ import ssl
 import time
 import certifi
 
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.shared.console import Console
 from app.classes.shared.websocket_manager import WebSocketManager
 
diff --git a/app/classes/shared/helpers.py b/app/classes/helpers/helpers.py
similarity index 100%
rename from app/classes/shared/helpers.py
rename to app/classes/helpers/helpers.py
diff --git a/app/classes/minecraft/bigbucket.py b/app/classes/minecraft/bigbucket.py
index 591aa6d8..db524a98 100644
--- a/app/classes/minecraft/bigbucket.py
+++ b/app/classes/minecraft/bigbucket.py
@@ -8,7 +8,7 @@ import requests
 
 from app.classes.controllers.servers_controller import ServersController
 from app.classes.models.server_permissions import PermissionsServers
-from app.classes.shared.file_helpers import FileHelpers
+from app.classes.helpers.file_helpers import FileHelpers
 from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger(__name__)
diff --git a/app/classes/minecraft/stats.py b/app/classes/minecraft/stats.py
index c3474d0d..61924fd4 100644
--- a/app/classes/minecraft/stats.py
+++ b/app/classes/minecraft/stats.py
@@ -10,7 +10,7 @@ from app.classes.minecraft.mc_ping import ping
 from app.classes.models.management import HostStats
 from app.classes.models.servers import HelperServers
 from app.classes.shared.null_writer import NullWriter
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 
 with redirect_stderr(NullWriter()):
     import psutil
diff --git a/app/classes/models/management.py b/app/classes/models/management.py
index b6be14b5..9a03eb54 100644
--- a/app/classes/models/management.py
+++ b/app/classes/models/management.py
@@ -16,7 +16,7 @@ from app.classes.models.base_model import BaseModel
 from app.classes.models.users import HelperUsers
 from app.classes.models.servers import Servers
 from app.classes.models.server_permissions import PermissionsServers
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger(__name__)
diff --git a/app/classes/models/roles.py b/app/classes/models/roles.py
index abc98735..e360f308 100644
--- a/app/classes/models/roles.py
+++ b/app/classes/models/roles.py
@@ -11,7 +11,7 @@ from peewee import (
 from playhouse.shortcuts import model_to_dict
 
 from app.classes.models.base_model import BaseModel
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 
 logger = logging.getLogger(__name__)
 
diff --git a/app/classes/models/server_stats.py b/app/classes/models/server_stats.py
index 64258c8c..735f54fa 100644
--- a/app/classes/models/server_stats.py
+++ b/app/classes/models/server_stats.py
@@ -4,7 +4,7 @@ import datetime
 from datetime import timedelta
 
 from app.classes.models.servers import Servers, HelperServers
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.shared.main_models import DatabaseShortcuts
 from app.classes.shared.migration import MigrationManager
 
diff --git a/app/classes/models/servers.py b/app/classes/models/servers.py
index e5d85c69..916fe982 100644
--- a/app/classes/models/servers.py
+++ b/app/classes/models/servers.py
@@ -13,7 +13,7 @@ from app.classes.shared.main_models import DatabaseShortcuts
 from app.classes.models.base_model import BaseModel
 
 # from app.classes.models.users import Users
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 
 logger = logging.getLogger(__name__)
 
diff --git a/app/classes/models/users.py b/app/classes/models/users.py
index 6f6a6bde..66d4c5e6 100644
--- a/app/classes/models/users.py
+++ b/app/classes/models/users.py
@@ -15,7 +15,7 @@ from peewee import (
 )
 from playhouse.shortcuts import model_to_dict
 
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.models.base_model import BaseModel
 from app.classes.models.roles import Roles, HelperRoles
 
diff --git a/app/classes/shared/backup_mgr.py b/app/classes/shared/backup_mgr.py
index e02aca4e..bd111927 100644
--- a/app/classes/shared/backup_mgr.py
+++ b/app/classes/shared/backup_mgr.py
@@ -14,7 +14,7 @@ from app.classes.models.management import HelpersManagement
 from app.classes.models.users import HelperUsers
 from app.classes.models.server_permissions import PermissionsServers
 from app.classes.shared.console import Console
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger(__name__)
diff --git a/app/classes/shared/command.py b/app/classes/shared/command.py
index 4b7abbc3..f1e1fd53 100644
--- a/app/classes/shared/command.py
+++ b/app/classes/shared/command.py
@@ -7,7 +7,7 @@ import getpass
 from app.classes.shared.console import Console
 from app.classes.shared.import3 import Import3
 
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.shared.tasks import TasksManager
 from app.classes.shared.migration import MigrationManager
 from app.classes.shared.main_controller import Controller
diff --git a/app/classes/shared/import_helper.py b/app/classes/shared/import_helper.py
index 030feb56..11e20be3 100644
--- a/app/classes/shared/import_helper.py
+++ b/app/classes/shared/import_helper.py
@@ -6,8 +6,8 @@ import threading
 
 from app.classes.controllers.server_perms_controller import PermissionsServers
 from app.classes.controllers.servers_controller import ServersController
-from app.classes.shared.helpers import Helpers
-from app.classes.shared.file_helpers import FileHelpers
+from app.classes.helpers.helpers import Helpers
+from app.classes.helpers.file_helpers import FileHelpers
 from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger(__name__)
diff --git a/app/classes/shared/main_controller.py b/app/classes/shared/main_controller.py
index 0d90a967..c1627155 100644
--- a/app/classes/shared/main_controller.py
+++ b/app/classes/shared/main_controller.py
@@ -30,8 +30,8 @@ from app.classes.controllers.server_perms_controller import ServerPermsControlle
 from app.classes.controllers.servers_controller import ServersController
 from app.classes.shared.authentication import Authentication
 from app.classes.shared.console import Console
-from app.classes.shared.helpers import Helpers
-from app.classes.shared.file_helpers import FileHelpers
+from app.classes.helpers.helpers import Helpers
+from app.classes.helpers.file_helpers import FileHelpers
 from app.classes.shared.import_helper import ImportHelpers
 from app.classes.minecraft.bigbucket import BigBucket
 from app.classes.shared.websocket_manager import WebSocketManager
diff --git a/app/classes/shared/main_models.py b/app/classes/shared/main_models.py
index 77633a4c..320a8643 100644
--- a/app/classes/shared/main_models.py
+++ b/app/classes/shared/main_models.py
@@ -1,7 +1,7 @@
 import logging
 from playhouse.shortcuts import model_to_dict
 
-from app.classes.shared.helpers import Helpers  # pylint: disable=unused-import
+from app.classes.helpers.helpers import Helpers  # pylint: disable=unused-import
 from app.classes.shared.console import Console
 
 logger = logging.getLogger(__name__)
diff --git a/app/classes/shared/migration.py b/app/classes/shared/migration.py
index 287bb4f3..c75d70e7 100644
--- a/app/classes/shared/migration.py
+++ b/app/classes/shared/migration.py
@@ -17,7 +17,7 @@ from playhouse.migrate import (
 )
 
 from app.classes.shared.console import Console
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 
 logger = logging.getLogger(__name__)
 
diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 42b2089f..e97720ea 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -31,10 +31,9 @@ from app.classes.models.server_stats import HelperServerStats
 from app.classes.models.management import HelpersManagement, HelpersWebhooks
 from app.classes.models.users import HelperUsers
 from app.classes.models.server_permissions import PermissionsServers
-from app.classes.shared.backup_mgr import BackupManager
 from app.classes.shared.console import Console
-from app.classes.shared.helpers import Helpers
-from app.classes.shared.file_helpers import FileHelpers
+from app.classes.helpers.helpers import Helpers
+from app.classes.helpers.file_helpers import FileHelpers
 from app.classes.shared.null_writer import NullWriter
 from app.classes.shared.websocket_manager import WebSocketManager
 from app.classes.web.webhooks.webhook_factory import WebhookFactory
diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index ebd8aadf..b919ca67 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -16,8 +16,8 @@ from app.classes.models.management import HelpersManagement
 from app.classes.models.users import HelperUsers
 from app.classes.controllers.users_controller import UsersController
 from app.classes.shared.console import Console
-from app.classes.shared.file_helpers import FileHelpers
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.file_helpers import FileHelpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.shared.main_controller import Controller
 from app.classes.web.tornado_handler import Webserver
 from app.classes.shared.websocket_manager import WebSocketManager
diff --git a/app/classes/web/base_handler.py b/app/classes/web/base_handler.py
index 2d9261ea..86279b75 100644
--- a/app/classes/web/base_handler.py
+++ b/app/classes/web/base_handler.py
@@ -8,8 +8,8 @@ import tornado.web
 from app.classes.models.crafty_permissions import EnumPermissionsCrafty
 from app.classes.models.server_permissions import EnumPermissionsServer
 from app.classes.models.users import ApiKeys
-from app.classes.shared.helpers import Helpers
-from app.classes.shared.file_helpers import FileHelpers
+from app.classes.helpers.helpers import Helpers
+from app.classes.helpers.file_helpers import FileHelpers
 from app.classes.shared.main_controller import Controller
 from app.classes.shared.translation import Translation
 from app.classes.shared.main_models import DatabaseShortcuts
diff --git a/app/classes/web/panel_handler.py b/app/classes/web/panel_handler.py
index 00068c6e..fc6f9fa2 100644
--- a/app/classes/web/panel_handler.py
+++ b/app/classes/web/panel_handler.py
@@ -22,7 +22,7 @@ from app.classes.models.server_permissions import EnumPermissionsServer
 from app.classes.models.crafty_permissions import EnumPermissionsCrafty
 from app.classes.models.management import HelpersManagement
 from app.classes.controllers.roles_controller import RolesController
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.shared.main_models import DatabaseShortcuts
 from app.classes.web.base_handler import BaseHandler
 from app.classes.web.webhooks.webhook_factory import WebhookFactory
diff --git a/app/classes/web/public_handler.py b/app/classes/web/public_handler.py
index a3d89d25..c2efceba 100644
--- a/app/classes/web/public_handler.py
+++ b/app/classes/web/public_handler.py
@@ -4,7 +4,7 @@ import nh3
 from jsonschema import validate
 from jsonschema.exceptions import ValidationError
 
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.models.users import HelperUsers
 from app.classes.web.base_handler import BaseHandler
 
diff --git a/app/classes/web/routes/api/auth/invalidate_tokens.py b/app/classes/web/routes/api/auth/invalidate_tokens.py
index 9e38670a..2ed8854a 100644
--- a/app/classes/web/routes/api/auth/invalidate_tokens.py
+++ b/app/classes/web/routes/api/auth/invalidate_tokens.py
@@ -1,6 +1,6 @@
 import logging
 from app.classes.web.base_api_handler import BaseApiHandler
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 
 logger = logging.getLogger(__name__)
 
diff --git a/app/classes/web/routes/api/auth/login.py b/app/classes/web/routes/api/auth/login.py
index 7e8131f3..94eb83fa 100644
--- a/app/classes/web/routes/api/auth/login.py
+++ b/app/classes/web/routes/api/auth/login.py
@@ -3,7 +3,7 @@ import json
 from jsonschema import validate
 from jsonschema.exceptions import ValidationError
 from app.classes.models.users import Users
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.web.base_api_handler import BaseApiHandler
 
 logger = logging.getLogger(__name__)
diff --git a/app/classes/web/routes/api/crafty/config/index.py b/app/classes/web/routes/api/crafty/config/index.py
index d625d339..3dc44779 100644
--- a/app/classes/web/routes/api/crafty/config/index.py
+++ b/app/classes/web/routes/api/crafty/config/index.py
@@ -3,7 +3,7 @@ import json
 from jsonschema import ValidationError, validate
 import orjson
 from playhouse.shortcuts import model_to_dict
-from app.classes.shared.file_helpers import FileHelpers
+from app.classes.helpers.file_helpers import FileHelpers
 from app.classes.web.base_api_handler import BaseApiHandler
 
 config_json_schema = {
diff --git a/app/classes/web/routes/api/crafty/imports/index.py b/app/classes/web/routes/api/crafty/imports/index.py
index 2aca2fa9..c0698e9d 100644
--- a/app/classes/web/routes/api/crafty/imports/index.py
+++ b/app/classes/web/routes/api/crafty/imports/index.py
@@ -5,7 +5,7 @@ import html
 from jsonschema import validate
 from jsonschema.exceptions import ValidationError
 from app.classes.models.crafty_permissions import EnumPermissionsCrafty
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.web.base_api_handler import BaseApiHandler
 from app.classes.web.websocket_handler import WebSocketManager
 
diff --git a/app/classes/web/routes/api/crafty/upload/index.py b/app/classes/web/routes/api/crafty/upload/index.py
index 0b0a612d..9d4e2743 100644
--- a/app/classes/web/routes/api/crafty/upload/index.py
+++ b/app/classes/web/routes/api/crafty/upload/index.py
@@ -2,7 +2,7 @@ import os
 import logging
 import shutil
 from app.classes.models.server_permissions import EnumPermissionsServer
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.web.base_api_handler import BaseApiHandler
 
 logger = logging.getLogger(__name__)
diff --git a/app/classes/web/routes/api/servers/server/action.py b/app/classes/web/routes/api/servers/server/action.py
index d8e58b2f..bba3b3d8 100644
--- a/app/classes/web/routes/api/servers/server/action.py
+++ b/app/classes/web/routes/api/servers/server/action.py
@@ -3,7 +3,7 @@ import os
 import json
 from app.classes.models.server_permissions import EnumPermissionsServer
 from app.classes.models.servers import Servers
-from app.classes.shared.file_helpers import FileHelpers
+from app.classes.helpers.file_helpers import FileHelpers
 from app.classes.web.base_api_handler import BaseApiHandler
 
 
diff --git a/app/classes/web/routes/api/servers/server/backups/backup/index.py b/app/classes/web/routes/api/servers/server/backups/backup/index.py
index 5d8fd2b5..88a2b6f7 100644
--- a/app/classes/web/routes/api/servers/server/backups/backup/index.py
+++ b/app/classes/web/routes/api/servers/server/backups/backup/index.py
@@ -5,9 +5,9 @@ from apscheduler.jobstores.base import JobLookupError
 from jsonschema import validate
 from jsonschema.exceptions import ValidationError
 from app.classes.models.server_permissions import EnumPermissionsServer
-from app.classes.shared.file_helpers import FileHelpers
+from app.classes.helpers.file_helpers import FileHelpers
 from app.classes.web.base_api_handler import BaseApiHandler
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 
 logger = logging.getLogger(__name__)
 
diff --git a/app/classes/web/routes/api/servers/server/files.py b/app/classes/web/routes/api/servers/server/files.py
index 2699ae0c..59b8ce85 100644
--- a/app/classes/web/routes/api/servers/server/files.py
+++ b/app/classes/web/routes/api/servers/server/files.py
@@ -5,8 +5,8 @@ import html
 from jsonschema import validate
 from jsonschema.exceptions import ValidationError
 from app.classes.models.server_permissions import EnumPermissionsServer
-from app.classes.shared.helpers import Helpers
-from app.classes.shared.file_helpers import FileHelpers
+from app.classes.helpers.helpers import Helpers
+from app.classes.helpers.file_helpers import FileHelpers
 from app.classes.web.base_api_handler import BaseApiHandler
 
 logger = logging.getLogger(__name__)
diff --git a/app/classes/web/server_handler.py b/app/classes/web/server_handler.py
index a8e278b2..77f5daef 100644
--- a/app/classes/web/server_handler.py
+++ b/app/classes/web/server_handler.py
@@ -4,7 +4,7 @@ import tornado.web
 import tornado.escape
 
 from app.classes.models.crafty_permissions import EnumPermissionsCrafty
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.shared.main_models import DatabaseShortcuts
 from app.classes.web.base_handler import BaseHandler
 
diff --git a/app/classes/web/static_handler.py b/app/classes/web/static_handler.py
index 4f75b036..ffe9f638 100644
--- a/app/classes/web/static_handler.py
+++ b/app/classes/web/static_handler.py
@@ -4,7 +4,7 @@ try:
     import tornado.web
 
 except ModuleNotFoundError as e:
-    from app.classes.shared.helpers import helper
+    from app.classes.helpers.helpers import helper
 
     helper.auto_installer_fix(e)
 
diff --git a/app/classes/web/tornado_handler.py b/app/classes/web/tornado_handler.py
index 0b8140e3..7c5a130b 100644
--- a/app/classes/web/tornado_handler.py
+++ b/app/classes/web/tornado_handler.py
@@ -13,8 +13,8 @@ import tornado.httpserver
 
 from app.classes.models.management import HelpersManagement
 from app.classes.shared.console import Console
-from app.classes.shared.helpers import Helpers
-from app.classes.shared.file_helpers import FileHelpers
+from app.classes.helpers.helpers import Helpers
+from app.classes.helpers.file_helpers import FileHelpers
 from app.classes.shared.main_controller import Controller
 from app.classes.web.public_handler import PublicHandler
 from app.classes.web.panel_handler import PanelHandler
diff --git a/app/classes/web/webhooks/base_webhook.py b/app/classes/web/webhooks/base_webhook.py
index 75e485fc..28bcdac7 100644
--- a/app/classes/web/webhooks/base_webhook.py
+++ b/app/classes/web/webhooks/base_webhook.py
@@ -2,7 +2,7 @@ from abc import ABC, abstractmethod
 import logging
 import requests
 
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 
 logger = logging.getLogger(__name__)
 helper = Helpers()
diff --git a/app/classes/web/websocket_handler.py b/app/classes/web/websocket_handler.py
index 3e426797..d2ddbae9 100644
--- a/app/classes/web/websocket_handler.py
+++ b/app/classes/web/websocket_handler.py
@@ -5,7 +5,7 @@ from urllib.parse import parse_qsl
 import tornado.websocket
 
 from app.classes.shared.main_controller import Controller
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.shared.websocket_manager import WebSocketManager
 
 logger = logging.getLogger(__name__)
diff --git a/app/migrations/20211120221511_api_keys.py b/app/migrations/20211120221511_api_keys.py
index f5dd1e46..51edc623 100644
--- a/app/migrations/20211120221511_api_keys.py
+++ b/app/migrations/20211120221511_api_keys.py
@@ -1,6 +1,6 @@
 import peewee
 import datetime
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 
 
 def migrate(migrator, database, **kwargs):
diff --git a/app/migrations/20240308_multi-backup.py b/app/migrations/20240308_multi-backup.py
index 56e01a5c..732f992e 100644
--- a/app/migrations/20240308_multi-backup.py
+++ b/app/migrations/20240308_multi-backup.py
@@ -5,10 +5,10 @@ import peewee
 import logging
 
 
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.shared.console import Console
 from app.classes.shared.migration import Migrator
-from app.classes.shared.file_helpers import FileHelpers
+from app.classes.helpers.file_helpers import FileHelpers
 
 logger = logging.getLogger(__name__)
 
diff --git a/main.py b/main.py
index a62a8d27..90d20988 100644
--- a/main.py
+++ b/main.py
@@ -9,10 +9,10 @@ import signal
 import peewee
 from packaging import version as pkg_version
 
-from app.classes.shared.file_helpers import FileHelpers
+from app.classes.helpers.file_helpers import FileHelpers
 from app.classes.shared.import3 import Import3
 from app.classes.shared.console import Console
-from app.classes.shared.helpers import Helpers
+from app.classes.helpers.helpers import Helpers
 from app.classes.models.users import HelperUsers
 from app.classes.models.management import HelpersManagement
 from app.classes.shared.import_helper import ImportHelpers