diff --git a/apps/server/src/modules/learnroom/uc/course-export.uc.spec.ts b/apps/server/src/modules/learnroom/uc/course-export.uc.spec.ts
index 3d93827f06d..34d37366416 100644
--- a/apps/server/src/modules/learnroom/uc/course-export.uc.spec.ts
+++ b/apps/server/src/modules/learnroom/uc/course-export.uc.spec.ts
@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { CommonCartridgeExportService } from '@src/modules/learnroom/service/common-cartridge-export.service';
-import { AuthorizationService } from '@src/modules';
+import { AuthorizationService } from '@src/modules/authorization';
 import { CourseExportUc } from './course-export.uc';
 import { CommonCartridgeVersion } from '../common-cartridge';
 
diff --git a/apps/server/src/modules/oauth-provider/uc/oauth-provider.client-crud.uc.spec.ts b/apps/server/src/modules/oauth-provider/uc/oauth-provider.client-crud.uc.spec.ts
index b9d2abc6117..5364ba89dd3 100644
--- a/apps/server/src/modules/oauth-provider/uc/oauth-provider.client-crud.uc.spec.ts
+++ b/apps/server/src/modules/oauth-provider/uc/oauth-provider.client-crud.uc.spec.ts
@@ -5,7 +5,7 @@ import { Permission, User } from '@shared/domain';
 import { OauthProviderService } from '@shared/infra/oauth-provider';
 import { ProviderOauthClient } from '@shared/infra/oauth-provider/dto';
 import { setupEntities, userFactory } from '@shared/testing';
-import { AuthorizationService } from '@src/modules';
+import { AuthorizationService } from '@src/modules/authorization';
 import { ICurrentUser } from '@src/modules/authentication';
 import { OauthProviderClientCrudUc } from './oauth-provider.client-crud.uc';
 import resetAllMocks = jest.resetAllMocks;
diff --git a/apps/server/src/modules/server/server.config.ts b/apps/server/src/modules/server/server.config.ts
index 1f3222b0250..736cb54c215 100644
--- a/apps/server/src/modules/server/server.config.ts
+++ b/apps/server/src/modules/server/server.config.ts
@@ -1,7 +1,9 @@
 import { Configuration } from '@hpi-schul-cloud/commons';
 import type { IIdentityManagementConfig } from '@shared/infra/identity-management';
 import type { ICoreModuleConfig } from '@src/core';
-import type { IAccountConfig, IFilesStorageClientConfig, IUserConfig } from '@src/modules/';
+import type { IAccountConfig } from '@src/modules/account';
+import type { IFilesStorageClientConfig } from '@src/modules/files-storage-client';
+import type { IUserConfig } from '@src/modules/user';
 import type { ICommonCartridgeConfig } from '@src/modules/learnroom/common-cartridge';
 
 export enum NodeEnvType {
diff --git a/apps/server/src/modules/task/controller/api-test/submission.api.spec.ts b/apps/server/src/modules/task/controller/api-test/submission.api.spec.ts
index f01b3f5baf0..17fbf13a934 100644
--- a/apps/server/src/modules/task/controller/api-test/submission.api.spec.ts
+++ b/apps/server/src/modules/task/controller/api-test/submission.api.spec.ts
@@ -14,7 +14,7 @@ import {
 	taskFactory,
 	userFactory,
 } from '@shared/testing';
-import { FilesStorageClientAdapterService } from '@src/modules';
+import { FilesStorageClientAdapterService } from '@src/modules/files-storage-client';
 import { JwtAuthGuard } from '@src/modules/authentication/guard/jwt-auth.guard';
 import { ServerTestModule } from '@src/modules/server/server.module';
 import { SubmissionStatusListResponse } from '@src/modules/task/controller/dto/submission.response';
diff --git a/apps/server/src/modules/video-conference/uc/video-conference-deprecated.uc.spec.ts b/apps/server/src/modules/video-conference/uc/video-conference-deprecated.uc.spec.ts
index 3680c4519da..fe9fbeec1a5 100644
--- a/apps/server/src/modules/video-conference/uc/video-conference-deprecated.uc.spec.ts
+++ b/apps/server/src/modules/video-conference/uc/video-conference-deprecated.uc.spec.ts
@@ -19,9 +19,11 @@ import { CalendarEventDto } from '@shared/infra/calendar/dto/calendar-event.dto'
 import { TeamsRepo, VideoConferenceRepo } from '@shared/repo';
 import { roleFactory, setupEntities, userDoFactory } from '@shared/testing';
 import { teamFactory } from '@shared/testing/factory/team.factory';
-import { AuthorizationService, LegacySchoolService, UserService } from '@src/modules';
+import { AuthorizationService } from '@src/modules/authorization';
 import { ICurrentUser } from '@src/modules/authentication';
 import { CourseService } from '@src/modules/learnroom/service';
+import { LegacySchoolService } from '@src/modules/legacy-school';
+import { UserService } from '@src/modules/user';
 import { IScopeInfo, VideoConference, VideoConferenceJoin, VideoConferenceState } from './dto';
 import { VideoConferenceDeprecatedUc } from './video-conference-deprecated.uc';
 import {
diff --git a/apps/server/src/shared/domain/rules/board-do.rule.spec.ts b/apps/server/src/shared/domain/rules/board-do.rule.spec.ts
index 3574250b67c..83b18ebad98 100644
--- a/apps/server/src/shared/domain/rules/board-do.rule.spec.ts
+++ b/apps/server/src/shared/domain/rules/board-do.rule.spec.ts
@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { roleFactory, setupEntities, userFactory } from '@shared/testing';
-import { Action } from '@src/modules';
+import { Action } from '@src/modules/authorization';
 import { AuthorizationHelper } from '@src/modules/authorization/authorization.helper';
 import { ObjectId } from 'bson';
 import { BoardDoAuthorizable, BoardRoles, UserRoleEnum } from '../domainobject';
diff --git a/apps/server/src/shared/infra/identity-management/keycloak-configuration/keycloak-configuration.module.ts b/apps/server/src/shared/infra/identity-management/keycloak-configuration/keycloak-configuration.module.ts
index 8c51103495d..c0cbf4d4513 100644
--- a/apps/server/src/shared/infra/identity-management/keycloak-configuration/keycloak-configuration.module.ts
+++ b/apps/server/src/shared/infra/identity-management/keycloak-configuration/keycloak-configuration.module.ts
@@ -2,7 +2,8 @@ import { Module } from '@nestjs/common';
 import { LoggerModule } from '@src/core/logger';
 import { EncryptionModule } from '@shared/infra/encryption';
 import { ConsoleWriterModule } from '@shared/infra/console';
-import { AccountModule, SystemModule } from '@src/modules';
+import { AccountModule } from '@src/modules/account';
+import { SystemModule } from '@src/modules/system';
 import { KeycloakAdministrationModule } from '../keycloak-administration/keycloak-administration.module';
 import { KeycloakConsole } from './console/keycloak-configuration.console';
 import { KeycloakConfigurationInputFiles } from './interface/keycloak-configuration-input-files.interface';