diff --git a/server/src/uds/REST/methods/actor_v3.py b/server/src/uds/REST/methods/actor_v3.py
index 98e6fb54b..b34cb04ea 100644
--- a/server/src/uds/REST/methods/actor_v3.py
+++ b/server/src/uds/REST/methods/actor_v3.py
@@ -40,7 +40,7 @@ from django.conf import settings
 # from uds.core import VERSION
 from uds.core import consts, exceptions, osmanagers, types
 from uds.core.managers.crypto import CryptoManager
-from uds.core.managers.user_service import UserServiceManager
+from uds.core.managers.userservice import UserServiceManager
 from uds.core.util import log, security
 from uds.core.util.cache import Cache
 from uds.core.util.config import GlobalConfig
diff --git a/server/src/uds/REST/methods/client.py b/server/src/uds/REST/methods/client.py
index 7b90620e0..84e298e06 100644
--- a/server/src/uds/REST/methods/client.py
+++ b/server/src/uds/REST/methods/client.py
@@ -37,7 +37,7 @@ from django.utils.translation import gettext as _
 
 from uds.core import consts, exceptions, types
 from uds.core.managers.crypto import CryptoManager
-from uds.core.managers.user_service import UserServiceManager
+from uds.core.managers.userservice import UserServiceManager
 from uds.core.services.exceptions import ServiceNotReadyError
 from uds.core.util.config import GlobalConfig
 from uds.core.util.rest.tools import match
diff --git a/server/src/uds/REST/methods/connection.py b/server/src/uds/REST/methods/connection.py
index e297744a7..7a84128a0 100644
--- a/server/src/uds/REST/methods/connection.py
+++ b/server/src/uds/REST/methods/connection.py
@@ -37,7 +37,7 @@ import typing
 
 from uds.core import exceptions, types
 from uds.core.managers.crypto import CryptoManager
-from uds.core.managers.user_service import UserServiceManager
+from uds.core.managers.userservice import UserServiceManager
 from uds.core.services.exceptions import ServiceNotReadyError
 from uds.core.types.requests import ExtendedHttpRequestWithUser
 from uds.core.util.rest.tools import match
diff --git a/server/src/uds/REST/methods/services_pools.py b/server/src/uds/REST/methods/services_pools.py
index 35b495472..dd8e6afab 100644
--- a/server/src/uds/REST/methods/services_pools.py
+++ b/server/src/uds/REST/methods/services_pools.py
@@ -40,7 +40,7 @@ from django.utils.translation import gettext
 from django.utils.translation import gettext_lazy as _
 
 from uds.core import types, exceptions, consts
-from uds.core.managers.user_service import UserServiceManager
+from uds.core.managers.userservice import UserServiceManager
 from uds.core.ui import gui
 from uds.core.consts.images import DEFAULT_THUMB_BASE64
 from uds.core.util import log, permissions, ensure
diff --git a/server/src/uds/REST/methods/user_services.py b/server/src/uds/REST/methods/user_services.py
index 7229eb4cc..168b247f7 100644
--- a/server/src/uds/REST/methods/user_services.py
+++ b/server/src/uds/REST/methods/user_services.py
@@ -39,7 +39,7 @@ from django.utils.translation import gettext as _
 import uds.core.types.permissions
 from uds import models
 from uds.core import exceptions, types
-from uds.core.managers.user_service import UserServiceManager
+from uds.core.managers.userservice import UserServiceManager
 from uds.core.types.states import State
 from uds.core.util import ensure, log, permissions
 from uds.core.util.model import process_uuid
diff --git a/server/src/uds/core/managers/user_service.py b/server/src/uds/core/managers/userservice.py
similarity index 99%
rename from server/src/uds/core/managers/user_service.py
rename to server/src/uds/core/managers/userservice.py
index 7ff47b5b7..c867b39ec 100644
--- a/server/src/uds/core/managers/user_service.py
+++ b/server/src/uds/core/managers/userservice.py
@@ -56,8 +56,8 @@ from uds.core.types.states import State
 from uds.core.util.stats import events
 from uds.models import MetaPool, ServicePool, ServicePoolPublication, Transport, User, UserService
 
-from .userservice import comms
-from .userservice.opchecker import UserServiceOpChecker
+from .userservice_helpers import comms
+from .userservice_helpers.opchecker import UserServiceOpChecker
 
 if typing.TYPE_CHECKING:
     from uds import models
diff --git a/server/src/uds/core/managers/userservice/__init__.py b/server/src/uds/core/managers/userservice_helpers/__init__.py
similarity index 100%
rename from server/src/uds/core/managers/userservice/__init__.py
rename to server/src/uds/core/managers/userservice_helpers/__init__.py
diff --git a/server/src/uds/core/managers/userservice/comms.py b/server/src/uds/core/managers/userservice_helpers/comms.py
similarity index 100%
rename from server/src/uds/core/managers/userservice/comms.py
rename to server/src/uds/core/managers/userservice_helpers/comms.py
diff --git a/server/src/uds/core/managers/userservice/opchecker.py b/server/src/uds/core/managers/userservice_helpers/opchecker.py
similarity index 100%
rename from server/src/uds/core/managers/userservice/opchecker.py
rename to server/src/uds/core/managers/userservice_helpers/opchecker.py
diff --git a/server/src/uds/core/services/specializations/fixed_machine/fixed_userservice.py b/server/src/uds/core/services/specializations/fixed_machine/fixed_userservice.py
index 432ffda57..8b852de45 100644
--- a/server/src/uds/core/services/specializations/fixed_machine/fixed_userservice.py
+++ b/server/src/uds/core/services/specializations/fixed_machine/fixed_userservice.py
@@ -39,7 +39,7 @@ import collections.abc
 from webbrowser import Opera
 
 from uds.core import services, consts
-from uds.core.managers.user_service import UserServiceManager
+from uds.core.managers.userservice import UserServiceManager
 from uds.core.types.states import State
 from uds.core.util import log, autoserializable
 from uds.core.util.model import sql_stamp_seconds
diff --git a/server/src/uds/core/workers/servicepools_cache_updater.py b/server/src/uds/core/workers/servicepools_cache_updater.py
index 29f2de98b..039118269 100644
--- a/server/src/uds/core/workers/servicepools_cache_updater.py
+++ b/server/src/uds/core/workers/servicepools_cache_updater.py
@@ -39,7 +39,7 @@ from django.db import transaction
 from django.db.models import Q
 from uds.core.util.config import GlobalConfig
 from uds.core.types.states import State
-from uds.core.managers.user_service import UserServiceManager
+from uds.core.managers.userservice import UserServiceManager
 from uds.core.services.exceptions import MaxServicesReachedError
 from uds.models import ServicePool, ServicePoolPublication, UserService
 from uds.core import services
diff --git a/server/src/uds/core/workers/userservice_cleaner.py b/server/src/uds/core/workers/userservice_cleaner.py
index ec9b4114b..53d686297 100644
--- a/server/src/uds/core/workers/userservice_cleaner.py
+++ b/server/src/uds/core/workers/userservice_cleaner.py
@@ -35,7 +35,7 @@ import typing
 import collections.abc
 
 from django.db import transaction
-from uds.core.managers.user_service import UserServiceManager
+from uds.core.managers.userservice import UserServiceManager
 from uds.core.util.config import GlobalConfig
 from uds.models import UserService
 from uds.core.util.model import sql_datetime
diff --git a/server/src/uds/models/calendar_action.py b/server/src/uds/models/calendar_action.py
index 73da6ba6b..bfff9f702 100644
--- a/server/src/uds/models/calendar_action.py
+++ b/server/src/uds/models/calendar_action.py
@@ -43,7 +43,7 @@ from django.db import models
 
 from uds.core.util import calendar
 from uds.core.util import log
-from uds.core.managers.user_service import UserServiceManager
+from uds.core.managers.userservice import UserServiceManager
 from uds.core import services, types, consts
 
 from .calendar import Calendar
diff --git a/server/src/uds/models/user_service.py b/server/src/uds/models/user_service.py
index f67dafbbb..e0e6add08 100644
--- a/server/src/uds/models/user_service.py
+++ b/server/src/uds/models/user_service.py
@@ -456,7 +456,7 @@ class UserService(UUIDModel, properties.PropertiesMixin):
         :note: If the state is Fase (set to not in use), a check for removal of this deployed service is launched.
         """
         # pylint: disable=import-outside-toplevel
-        from uds.core.managers.user_service import UserServiceManager
+        from uds.core.managers.userservice import UserServiceManager
 
         self.in_use = inUse
         self.in_use_date = sql_datetime()
@@ -529,7 +529,7 @@ class UserService(UUIDModel, properties.PropertiesMixin):
         Returns if this service is ready (not preparing or marked for removal)
         """
         # pylint: disable=import-outside-toplevel
-        from uds.core.managers.user_service import UserServiceManager
+        from uds.core.managers.userservice import UserServiceManager
 
         # Call to isReady of the instance
         return UserServiceManager().is_ready(self)
@@ -554,7 +554,7 @@ class UserService(UUIDModel, properties.PropertiesMixin):
         Asks the UserServiceManager to cancel the current operation of this user deployed service.
         """
         # pylint: disable=import-outside-toplevel
-        from uds.core.managers.user_service import UserServiceManager
+        from uds.core.managers.userservice import UserServiceManager
 
         # Cancel is a "forced" operation, so they are not checked against limits
         UserServiceManager().cancel(self)
@@ -582,7 +582,7 @@ class UserService(UUIDModel, properties.PropertiesMixin):
             cacheLevel: New cache level to put object in
         """
         # pylint: disable=import-outside-toplevel
-        from uds.core.managers.user_service import UserServiceManager
+        from uds.core.managers.userservice import UserServiceManager
 
         UserServiceManager().move_to_level(self, cacheLevel)
 
diff --git a/server/src/uds/services/OVirt/deployment.py b/server/src/uds/services/OVirt/deployment.py
index d06ef5fff..327f2c62c 100644
--- a/server/src/uds/services/OVirt/deployment.py
+++ b/server/src/uds/services/OVirt/deployment.py
@@ -37,7 +37,7 @@ import pickle  # nosec: not insecure, we are loading our own data
 import typing
 
 from uds.core import consts, services
-from uds.core.managers.user_service import UserServiceManager
+from uds.core.managers.userservice import UserServiceManager
 from uds.core.types.states import State
 from uds.core.util import autoserializable, log
 
diff --git a/server/src/uds/services/Proxmox/deployment.py b/server/src/uds/services/Proxmox/deployment.py
index f5e3db887..991071956 100644
--- a/server/src/uds/services/Proxmox/deployment.py
+++ b/server/src/uds/services/Proxmox/deployment.py
@@ -37,7 +37,7 @@ import typing
 import collections.abc
 
 from uds.core import services, consts
-from uds.core.managers.user_service import UserServiceManager
+from uds.core.managers.userservice import UserServiceManager
 from uds.core.types.states import State
 from uds.core.util import log, autoserializable
 from uds.core.util.model import sql_stamp_seconds
diff --git a/server/src/uds/transports/X2GO/x2go_base.py b/server/src/uds/transports/X2GO/x2go_base.py
index 5f93d6259..2ba8b0b5e 100644
--- a/server/src/uds/transports/X2GO/x2go_base.py
+++ b/server/src/uds/transports/X2GO/x2go_base.py
@@ -41,7 +41,7 @@ from django.utils.translation import gettext_lazy
 from django.utils.translation import gettext_noop as _
 
 from uds.core import consts, transports, types
-from uds.core.managers.user_service import UserServiceManager
+from uds.core.managers.userservice import UserServiceManager
 from uds.core.types.preferences import CommonPrefs
 from uds.core.ui import gui
 from uds.core.util import connection
diff --git a/server/src/uds/web/util/services.py b/server/src/uds/web/util/services.py
index 5b2e8401d..d66d998a3 100644
--- a/server/src/uds/web/util/services.py
+++ b/server/src/uds/web/util/services.py
@@ -40,7 +40,7 @@ from django.utils.translation import gettext
 from uds.core import types
 from uds.core.auths.auth import web_password
 from uds.core.managers.crypto import CryptoManager
-from uds.core.managers.user_service import UserServiceManager
+from uds.core.managers.userservice import UserServiceManager
 from uds.core.services.exceptions import (
     MaxServicesReachedError,
     ServiceAccessDeniedByCalendar,
diff --git a/server/src/uds/web/views/auth.py b/server/src/uds/web/views/auth.py
index 7d1013949..c09ebc595 100644
--- a/server/src/uds/web/views/auth.py
+++ b/server/src/uds/web/views/auth.py
@@ -43,7 +43,7 @@ from uds.core import auths, consts, exceptions, types
 from uds.core.auths.auth import (authenticate_via_callback, log_login,
                                  uds_cookie, web_login, web_logout)
 from uds.core.managers.crypto import CryptoManager
-from uds.core.managers.user_service import UserServiceManager
+from uds.core.managers.userservice import UserServiceManager
 from uds.core.services.exceptions import ServiceNotReadyError
 from uds.core.types.states import State
 from uds.core.util import html
diff --git a/server/src/uds/web/views/main.py b/server/src/uds/web/views/main.py
index 8bd4a322a..5ed4955f4 100644
--- a/server/src/uds/web/views/main.py
+++ b/server/src/uds/web/views/main.py
@@ -48,7 +48,7 @@ from uds import models
 from uds.core import consts, exceptions, mfas, types
 from uds.core.auths import auth
 from uds.core.managers.crypto import CryptoManager
-from uds.core.managers.user_service import UserServiceManager
+from uds.core.managers.userservice import UserServiceManager
 from uds.core.util import config, storage
 from uds.core.util.model import sql_stamp_seconds
 from uds.web.forms.login_form import LoginForm
diff --git a/server/src/uds/web/views/service.py b/server/src/uds/web/views/service.py
index 0cf8d51d0..cb2a844fd 100644
--- a/server/src/uds/web/views/service.py
+++ b/server/src/uds/web/views/service.py
@@ -37,7 +37,7 @@ from django.http import HttpResponse
 from django.views.decorators.cache import cache_page, never_cache
 
 from uds.core.auths.auth import web_login_required, web_password
-from uds.core.managers.user_service import UserServiceManager
+from uds.core.managers.userservice import UserServiceManager
 from uds.core.types.requests import ExtendedHttpRequest
 from uds.core.consts.images import DEFAULT_IMAGE
 from uds.core.util.model import process_uuid