diff --git a/apps/server/src/modules/learnroom/service/board-copy.service.ts b/apps/server/src/modules/learnroom/service/board-copy.service.ts
index f2c2e321dfc..b419c9f0593 100644
--- a/apps/server/src/modules/learnroom/service/board-copy.service.ts
+++ b/apps/server/src/modules/learnroom/service/board-copy.service.ts
@@ -17,7 +17,7 @@ import { LegacyLogger } from '@src/core/logger';
 import { CopyElementType, CopyHelperService, CopyStatus } from '@src/modules/copy-helper';
 import { getResolvedValues } from '@src/modules/files-storage/helper';
 import { LessonCopyService } from '@src/modules/lesson/service';
-import { TaskCopyService } from '@src/modules/task';
+import { TaskCopyService } from '@src/modules/task/service';
 import { sortBy } from 'lodash';
 
 type BoardCopyParams = {
diff --git a/apps/server/src/modules/learnroom/service/course.service.ts b/apps/server/src/modules/learnroom/service/course.service.ts
index 604d09ecd05..9eb1f5f1ad3 100644
--- a/apps/server/src/modules/learnroom/service/course.service.ts
+++ b/apps/server/src/modules/learnroom/service/course.service.ts
@@ -3,7 +3,6 @@ import { CourseRepo } from '@shared/repo';
 import { Course, EntityId } from '@shared/domain';
 
 @Injectable()
-// Hint: If you inject this service, sometimes you have to use the full path as import for some reason
 export class CourseService {
 	constructor(private readonly repo: CourseRepo) {}
 
diff --git a/apps/server/src/modules/learnroom/service/rooms.service.spec.ts b/apps/server/src/modules/learnroom/service/rooms.service.spec.ts
index 668d6bcaabf..789edcb9099 100644
--- a/apps/server/src/modules/learnroom/service/rooms.service.spec.ts
+++ b/apps/server/src/modules/learnroom/service/rooms.service.spec.ts
@@ -7,7 +7,7 @@ import { BoardExternalReference, BoardExternalReferenceType, EntityId } from '@s
 import { BoardRepo, LessonRepo } from '@shared/repo';
 import { boardFactory, courseFactory, lessonFactory, setupEntities, taskFactory, userFactory } from '@shared/testing';
 import { CardService, ColumnBoardService, ColumnService, ContentElementService } from '@src/modules/board';
-import { TaskService } from '@src/modules/task';
+import { TaskService } from '@src/modules/task/service';
 import { ColumnBoardTargetService } from './column-board-target.service';
 import { RoomsService } from './rooms.service';
 
diff --git a/apps/server/src/modules/learnroom/service/rooms.service.ts b/apps/server/src/modules/learnroom/service/rooms.service.ts
index adbd09c1dbe..24bffb03f4f 100644
--- a/apps/server/src/modules/learnroom/service/rooms.service.ts
+++ b/apps/server/src/modules/learnroom/service/rooms.service.ts
@@ -3,7 +3,7 @@ import { Injectable } from '@nestjs/common';
 import { Board, BoardExternalReferenceType, ColumnBoardTarget, EntityId } from '@shared/domain';
 import { BoardRepo, LessonRepo } from '@shared/repo';
 import { ColumnBoardService } from '@src/modules/board';
-import { TaskService } from '@src/modules/task';
+import { TaskService } from '@src/modules/task/service';
 import { ColumnBoardTargetService } from './column-board-target.service';
 
 @Injectable()
diff --git a/apps/server/src/modules/lesson/service/lesson-copy.service.spec.ts b/apps/server/src/modules/lesson/service/lesson-copy.service.spec.ts
index 3e0ef93b4e9..d9dbd647185 100644
--- a/apps/server/src/modules/lesson/service/lesson-copy.service.spec.ts
+++ b/apps/server/src/modules/lesson/service/lesson-copy.service.spec.ts
@@ -25,7 +25,7 @@ import {
 } from '@shared/testing';
 import { CopyElementType, CopyHelperService, CopyStatus, CopyStatusEnum } from '@src/modules/copy-helper';
 import { CopyFilesService } from '@src/modules/files-storage-client';
-import { TaskCopyService } from '@src/modules/task';
+import { TaskCopyService } from '@src/modules/task/service';
 import { EtherpadService } from './etherpad.service';
 import { LessonCopyService } from './lesson-copy.service';
 import { NexboardService } from './nexboard.service';
diff --git a/apps/server/src/modules/sharing/service/share-token.service.spec.ts b/apps/server/src/modules/sharing/service/share-token.service.spec.ts
index 837c36eed8e..07192e09df8 100644
--- a/apps/server/src/modules/sharing/service/share-token.service.spec.ts
+++ b/apps/server/src/modules/sharing/service/share-token.service.spec.ts
@@ -4,7 +4,7 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { courseFactory, lessonFactory, setupEntities, shareTokenFactory, taskFactory } from '@shared/testing';
 import { CourseService } from '@src/modules/learnroom/service/course.service';
 import { LessonService } from '@src/modules/lesson/service';
-import { TaskService } from '@src/modules/task';
+import { TaskService } from '@src/modules/task/service';
 import { ObjectId } from 'bson';
 import { ShareTokenContextType, ShareTokenParentType } from '../domainobject/share-token.do';
 import { ShareTokenRepo } from '../repo/share-token.repo';
diff --git a/apps/server/src/modules/sharing/service/share-token.service.ts b/apps/server/src/modules/sharing/service/share-token.service.ts
index 3bb87a410f4..1c89c4c40c7 100644
--- a/apps/server/src/modules/sharing/service/share-token.service.ts
+++ b/apps/server/src/modules/sharing/service/share-token.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { CourseService } from '@src/modules/learnroom/service/course.service';
 import { LessonService } from '@src/modules/lesson/service';
-import { TaskService } from '@src/modules/task';
+import { TaskService } from '@src/modules/task/service';
 import {
 	ShareTokenContext,
 	ShareTokenDO,
diff --git a/apps/server/src/modules/sharing/uc/share-token.uc.spec.ts b/apps/server/src/modules/sharing/uc/share-token.uc.spec.ts
index 85280c20dc1..b7fd8403b7a 100644
--- a/apps/server/src/modules/sharing/uc/share-token.uc.spec.ts
+++ b/apps/server/src/modules/sharing/uc/share-token.uc.spec.ts
@@ -20,7 +20,7 @@ import { CopyElementType, CopyStatus, CopyStatusEnum } from '@src/modules/copy-h
 import { CourseCopyService } from '@src/modules/learnroom';
 import { CourseService } from '@src/modules/learnroom/service/course.service';
 import { LessonCopyService } from '@src/modules/lesson/service';
-import { TaskCopyService } from '@src/modules/task';
+import { TaskCopyService } from '@src/modules/task/service';
 import { ShareTokenContextType, ShareTokenParentType, ShareTokenPayload } from '../domainobject/share-token.do';
 import { ShareTokenService } from '../service';
 import { ShareTokenUC } from './share-token.uc';
diff --git a/apps/server/src/modules/sharing/uc/share-token.uc.ts b/apps/server/src/modules/sharing/uc/share-token.uc.ts
index b8aeafb7029..de34ffe5239 100644
--- a/apps/server/src/modules/sharing/uc/share-token.uc.ts
+++ b/apps/server/src/modules/sharing/uc/share-token.uc.ts
@@ -7,7 +7,7 @@ import { CopyStatus } from '@src/modules/copy-helper';
 import { CourseCopyService } from '@src/modules/learnroom';
 import { CourseService } from '@src/modules/learnroom/service/course.service';
 import { LessonCopyService } from '@src/modules/lesson/service';
-import { TaskCopyService } from '@src/modules/task';
+import { TaskCopyService } from '@src/modules/task/service';
 import {
 	ShareTokenContext,
 	ShareTokenContextType,
diff --git a/apps/server/src/modules/task/index.ts b/apps/server/src/modules/task/index.ts
index 22c7d98fc17..62ab8a69e94 100644
--- a/apps/server/src/modules/task/index.ts
+++ b/apps/server/src/modules/task/index.ts
@@ -1,2 +1 @@
 export * from './task.module';
-export { TaskCopyService, TaskService } from './service';
diff --git a/apps/server/src/modules/tool/tool-launch/service/strategy/abstract-launch.strategy.spec.ts b/apps/server/src/modules/tool/tool-launch/service/strategy/abstract-launch.strategy.spec.ts
index 97e85af247a..a9514e62de1 100644
--- a/apps/server/src/modules/tool/tool-launch/service/strategy/abstract-launch.strategy.spec.ts
+++ b/apps/server/src/modules/tool/tool-launch/service/strategy/abstract-launch.strategy.spec.ts
@@ -12,7 +12,7 @@ import {
 	schoolExternalToolFactory,
 	setupEntities,
 } from '@shared/testing';
-import { CourseService } from '@src/modules/learnroom/service/course.service';
+import { CourseService } from '@src/modules/learnroom/service';
 import { SchoolService } from '@src/modules/school';
 import { CustomParameterEntry } from '../../../common/domain';
 import {
diff --git a/apps/server/src/modules/tool/tool-launch/service/strategy/basic-tool-launch.strategy.spec.ts b/apps/server/src/modules/tool/tool-launch/service/strategy/basic-tool-launch.strategy.spec.ts
index 4aa1314ce41..76cdb6724d0 100644
--- a/apps/server/src/modules/tool/tool-launch/service/strategy/basic-tool-launch.strategy.spec.ts
+++ b/apps/server/src/modules/tool/tool-launch/service/strategy/basic-tool-launch.strategy.spec.ts
@@ -1,14 +1,14 @@
 import { createMock } from '@golevelup/ts-jest';
 import { Test, TestingModule } from '@nestjs/testing';
-import { CourseRepo } from '@shared/repo';
 import { contextExternalToolFactory, externalToolFactory, schoolExternalToolFactory } from '@shared/testing';
 import { SchoolService } from '@src/modules/school';
+import { CourseService } from '@src/modules/learnroom/service';
+import { ContextExternalTool } from '../../../context-external-tool/domain';
+import { ExternalTool } from '../../../external-tool/domain';
+import { SchoolExternalTool } from '../../../school-external-tool/domain';
 import { LaunchRequestMethod, PropertyData, PropertyLocation } from '../../types';
 import { BasicToolLaunchStrategy } from './basic-tool-launch.strategy';
 import { IToolLaunchParams } from './tool-launch-params.interface';
-import { ExternalTool } from '../../../external-tool/domain';
-import { SchoolExternalTool } from '../../../school-external-tool/domain';
-import { ContextExternalTool } from '../../../context-external-tool/domain';
 
 describe('BasicToolLaunchStrategy', () => {
 	let module: TestingModule;
@@ -23,8 +23,8 @@ describe('BasicToolLaunchStrategy', () => {
 					useValue: createMock<SchoolService>(),
 				},
 				{
-					provide: CourseRepo,
-					useValue: createMock<CourseRepo>(),
+					provide: CourseService,
+					useValue: createMock<CourseService>(),
 				},
 			],
 		}).compile();
diff --git a/apps/server/src/modules/tool/tool-launch/service/strategy/lti11-tool-launch.strategy.ts b/apps/server/src/modules/tool/tool-launch/service/strategy/lti11-tool-launch.strategy.ts
index acc08d346e6..aa2149c8da4 100644
--- a/apps/server/src/modules/tool/tool-launch/service/strategy/lti11-tool-launch.strategy.ts
+++ b/apps/server/src/modules/tool/tool-launch/service/strategy/lti11-tool-launch.strategy.ts
@@ -5,7 +5,7 @@ import { PseudonymService } from '@src/modules/pseudonym';
 import { SchoolService } from '@src/modules/school';
 import { UserService } from '@src/modules/user';
 import { Authorization } from 'oauth-1.0a';
-import { CourseService } from '@src/modules/learnroom/service/course.service';
+import { CourseService } from '@src/modules/learnroom/service';
 import { LtiRole } from '../../../common/enum';
 import { ExternalTool } from '../../../external-tool/domain';
 import { LtiRoleMapper } from '../../mapper';
diff --git a/apps/server/src/modules/tool/tool-launch/service/strategy/oauth2-tool-launch.strategy.spec.ts b/apps/server/src/modules/tool/tool-launch/service/strategy/oauth2-tool-launch.strategy.spec.ts
index 3543934dfa2..c206ded9ad5 100644
--- a/apps/server/src/modules/tool/tool-launch/service/strategy/oauth2-tool-launch.strategy.spec.ts
+++ b/apps/server/src/modules/tool/tool-launch/service/strategy/oauth2-tool-launch.strategy.spec.ts
@@ -2,7 +2,7 @@ import { createMock } from '@golevelup/ts-jest';
 import { Test, TestingModule } from '@nestjs/testing';
 import { contextExternalToolFactory, externalToolFactory, schoolExternalToolFactory } from '@shared/testing';
 import { SchoolService } from '@src/modules/school';
-import { CourseService } from '@src/modules/learnroom/service/course.service';
+import { CourseService } from '@src/modules/learnroom/service';
 import { ContextExternalTool } from '../../../context-external-tool/domain';
 import { ExternalTool } from '../../../external-tool/domain';
 import { SchoolExternalTool } from '../../../school-external-tool/domain';