diff --git a/frontend/app/layouts/default.vue b/frontend/app/layouts/default.vue
index 9012026..7ae9da6 100644
--- a/frontend/app/layouts/default.vue
+++ b/frontend/app/layouts/default.vue
@@ -125,8 +125,8 @@
 
 <script setup lang="ts">
 import type { UserData } from '~/services/dto/user-data'
-import type { Project } from '~/services/dto/project'
-import type { TaskTag } from '~/services/dto/task-tag'
+import type { Project } from '~/modules/project-management/services/dto/project'
+import type { TaskTag } from '~/modules/project-management/services/dto/task-tag'
 import { useAppVersion } from '~/composables/useAppVersion'
 import type { HydraCollection } from '~/utils/api'
 import { extractHydraMembers } from '~/utils/api'
diff --git a/frontend/components/admin/AdminEffortTab.vue b/frontend/components/admin/AdminEffortTab.vue
index 6132be6..b626bca 100644
--- a/frontend/components/admin/AdminEffortTab.vue
+++ b/frontend/components/admin/AdminEffortTab.vue
@@ -30,8 +30,8 @@
 </template>
 
 <script setup lang="ts">
-import type { TaskEffort } from '~/services/dto/task-effort'
-import { useTaskEffortService } from '~/services/task-efforts'
+import type { TaskEffort } from '~/modules/project-management/services/dto/task-effort'
+import { useTaskEffortService } from '~/modules/project-management/services/task-efforts'
 
 import type { DataTableColumn } from '~/components/ui/DataTable.vue'
 
diff --git a/frontend/components/admin/AdminPriorityTab.vue b/frontend/components/admin/AdminPriorityTab.vue
index 8391328..0f91660 100644
--- a/frontend/components/admin/AdminPriorityTab.vue
+++ b/frontend/components/admin/AdminPriorityTab.vue
@@ -37,8 +37,8 @@
 </template>
 
 <script setup lang="ts">
-import type { TaskPriority } from '~/services/dto/task-priority'
-import { useTaskPriorityService } from '~/services/task-priorities'
+import type { TaskPriority } from '~/modules/project-management/services/dto/task-priority'
+import { useTaskPriorityService } from '~/modules/project-management/services/task-priorities'
 
 import type { DataTableColumn } from '~/components/ui/DataTable.vue'
 
diff --git a/frontend/components/admin/AdminTagTab.vue b/frontend/components/admin/AdminTagTab.vue
index 45b22da..13313a8 100644
--- a/frontend/components/admin/AdminTagTab.vue
+++ b/frontend/components/admin/AdminTagTab.vue
@@ -37,8 +37,8 @@
 </template>
 
 <script setup lang="ts">
-import type { TaskTag } from '~/services/dto/task-tag'
-import { useTaskTagService } from '~/services/task-tags'
+import type { TaskTag } from '~/modules/project-management/services/dto/task-tag'
+import { useTaskTagService } from '~/modules/project-management/services/task-tags'
 
 import type { DataTableColumn } from '~/components/ui/DataTable.vue'
 
diff --git a/frontend/components/admin/AdminWorkflowTab.vue b/frontend/components/admin/AdminWorkflowTab.vue
index 0c6fbdd..db4b5f5 100644
--- a/frontend/components/admin/AdminWorkflowTab.vue
+++ b/frontend/components/admin/AdminWorkflowTab.vue
@@ -42,8 +42,8 @@
 </template>
 
 <script setup lang="ts">
-import type { Workflow } from '~/services/dto/workflow'
-import { useWorkflowService } from '~/services/workflows'
+import type { Workflow } from '~/modules/project-management/services/dto/workflow'
+import { useWorkflowService } from '~/modules/project-management/services/workflows'
 import type { DataTableColumn } from '~/components/ui/DataTable.vue'
 
 const { t } = useI18n()
diff --git a/frontend/components/admin/WorkflowDrawer.vue b/frontend/components/admin/WorkflowDrawer.vue
index 3ffd57d..0495956 100644
--- a/frontend/components/admin/WorkflowDrawer.vue
+++ b/frontend/components/admin/WorkflowDrawer.vue
@@ -96,11 +96,11 @@
 </template>
 
 <script setup lang="ts">
-import type { Workflow, StatusCategory } from '~/services/dto/workflow'
-import { STATUS_CATEGORY_COLOR } from '~/services/dto/workflow'
-import type { TaskStatusWrite } from '~/services/dto/task-status'
-import { useWorkflowService } from '~/services/workflows'
-import { useTaskStatusService } from '~/services/task-statuses'
+import type { Workflow, StatusCategory } from '~/modules/project-management/services/dto/workflow'
+import { STATUS_CATEGORY_COLOR } from '~/modules/project-management/services/dto/workflow'
+import type { TaskStatusWrite } from '~/modules/project-management/services/dto/task-status'
+import { useWorkflowService } from '~/modules/project-management/services/workflows'
+import { useTaskStatusService } from '~/modules/project-management/services/task-statuses'
 
 const { t } = useI18n()
 
diff --git a/frontend/components/mail/MailCreateTaskModal.vue b/frontend/components/mail/MailCreateTaskModal.vue
index 3b75539..93f666b 100644
--- a/frontend/components/mail/MailCreateTaskModal.vue
+++ b/frontend/components/mail/MailCreateTaskModal.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
 import type { MailMessageDetailDto } from '~/services/dto/mail'
-import type { Task } from '~/services/dto/task'
-import type { Project } from '~/services/dto/project'
-import type { TaskGroup } from '~/services/dto/task-group'
+import type { Task } from '~/modules/project-management/services/dto/task'
+import type { Project } from '~/modules/project-management/services/dto/project'
+import type { TaskGroup } from '~/modules/project-management/services/dto/task-group'
 import type { UserData } from '~/services/dto/user-data'
 import { useMailService } from '~/services/mail'
-import { useProjectService } from '~/services/projects'
-import { useTaskGroupService } from '~/services/task-groups'
+import { useProjectService } from '~/modules/project-management/services/projects'
+import { useTaskGroupService } from '~/modules/project-management/services/task-groups'
 import { useUserService } from '~/services/users'
 import { useAuthStore } from '~/shared/stores/auth'
 
diff --git a/frontend/components/mail/MailLinkTaskModal.vue b/frontend/components/mail/MailLinkTaskModal.vue
index 9749099..00c641c 100644
--- a/frontend/components/mail/MailLinkTaskModal.vue
+++ b/frontend/components/mail/MailLinkTaskModal.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import type { Task } from '~/services/dto/task'
-import type { Project } from '~/services/dto/project'
+import type { Task } from '~/modules/project-management/services/dto/task'
+import type { Project } from '~/modules/project-management/services/dto/project'
 import { useMailService } from '~/services/mail'
-import { useTaskService } from '~/services/tasks'
-import { useProjectService } from '~/services/projects'
+import { useTaskService } from '~/modules/project-management/services/tasks'
+import { useProjectService } from '~/modules/project-management/services/projects'
 
 const props = defineProps<{
     modelValue: boolean
diff --git a/frontend/components/project/ProjectDrawer.vue b/frontend/modules/project-management/components/ProjectDrawer.vue
similarity index 98%
rename from frontend/components/project/ProjectDrawer.vue
rename to frontend/modules/project-management/components/ProjectDrawer.vue
index 27d639b..cd9aef4 100644
--- a/frontend/components/project/ProjectDrawer.vue
+++ b/frontend/modules/project-management/components/ProjectDrawer.vue
@@ -123,11 +123,11 @@
 </template>
 
 <script setup lang="ts">
-import type { Project, ProjectWrite } from '~/services/dto/project'
+import type { Project, ProjectWrite } from '~/modules/project-management/services/dto/project'
 import type { Client } from '~/services/dto/client'
 import type { GiteaRepository } from '~/services/dto/gitea'
 import type { BookStackShelf } from '~/services/dto/bookstack'
-import { useProjectService } from '~/services/projects'
+import { useProjectService } from '~/modules/project-management/services/projects'
 import { useGiteaService } from '~/services/gitea'
 import { useBookStackService } from '~/services/bookstack'
 
diff --git a/frontend/components/project/ProjectGroupTab.vue b/frontend/modules/project-management/components/ProjectGroupTab.vue
similarity index 94%
rename from frontend/components/project/ProjectGroupTab.vue
rename to frontend/modules/project-management/components/ProjectGroupTab.vue
index 45047d1..e5e8627 100644
--- a/frontend/components/project/ProjectGroupTab.vue
+++ b/frontend/modules/project-management/components/ProjectGroupTab.vue
@@ -67,10 +67,10 @@
 </template>
 
 <script setup lang="ts">
-import type { TaskGroup } from '~/services/dto/task-group'
-import type { Task } from '~/services/dto/task'
-import { useTaskGroupService } from '~/services/task-groups'
-import { useTaskService } from '~/services/tasks'
+import type { TaskGroup } from '~/modules/project-management/services/dto/task-group'
+import type { Task } from '~/modules/project-management/services/dto/task'
+import { useTaskGroupService } from '~/modules/project-management/services/task-groups'
+import { useTaskService } from '~/modules/project-management/services/tasks'
 import { stripRichText } from '~/utils/format'
 
 const props = defineProps<{
diff --git a/frontend/components/project/ProjectWorkflowSwitchModal.vue b/frontend/modules/project-management/components/ProjectWorkflowSwitchModal.vue
similarity index 94%
rename from frontend/components/project/ProjectWorkflowSwitchModal.vue
rename to frontend/modules/project-management/components/ProjectWorkflowSwitchModal.vue
index 3b5a3a6..c485f95 100644
--- a/frontend/components/project/ProjectWorkflowSwitchModal.vue
+++ b/frontend/modules/project-management/components/ProjectWorkflowSwitchModal.vue
@@ -82,12 +82,12 @@
 </template>
 
 <script setup lang="ts">
-import type { Project } from '~/services/dto/project'
-import type { Task } from '~/services/dto/task'
-import type { Workflow } from '~/services/dto/workflow'
-import type { TaskStatus } from '~/services/dto/task-status'
-import { useWorkflowService } from '~/services/workflows'
-import { useTaskService } from '~/services/tasks'
+import type { Project } from '~/modules/project-management/services/dto/project'
+import type { Task } from '~/modules/project-management/services/dto/task'
+import type { Workflow } from '~/modules/project-management/services/dto/workflow'
+import type { TaskStatus } from '~/modules/project-management/services/dto/task-status'
+import { useWorkflowService } from '~/modules/project-management/services/workflows'
+import { useTaskService } from '~/modules/project-management/services/tasks'
 
 const props = defineProps<{
     modelValue: boolean
diff --git a/frontend/components/task/StatusPickerPopover.vue b/frontend/modules/project-management/components/StatusPickerPopover.vue
similarity index 91%
rename from frontend/components/task/StatusPickerPopover.vue
rename to frontend/modules/project-management/components/StatusPickerPopover.vue
index a37e074..0927082 100644
--- a/frontend/components/task/StatusPickerPopover.vue
+++ b/frontend/modules/project-management/components/StatusPickerPopover.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { TaskStatus } from '~/services/dto/task-status'
+import type { TaskStatus } from '~/modules/project-management/services/dto/task-status'
 
 defineProps<{
     statuses: TaskStatus[]
diff --git a/frontend/components/task/TaskBookStackLinks.vue b/frontend/modules/project-management/components/TaskBookStackLinks.vue
similarity index 100%
rename from frontend/components/task/TaskBookStackLinks.vue
rename to frontend/modules/project-management/components/TaskBookStackLinks.vue
diff --git a/frontend/components/task/TaskBulkActions.vue b/frontend/modules/project-management/components/TaskBulkActions.vue
similarity index 92%
rename from frontend/components/task/TaskBulkActions.vue
rename to frontend/modules/project-management/components/TaskBulkActions.vue
index 77cecd4..0d16060 100644
--- a/frontend/components/task/TaskBulkActions.vue
+++ b/frontend/modules/project-management/components/TaskBulkActions.vue
@@ -104,13 +104,13 @@
 </template>
 
 <script setup lang="ts">
-import type { Task } from '~/services/dto/task'
-import type { TaskStatus } from '~/services/dto/task-status'
-import type { TaskEffort } from '~/services/dto/task-effort'
-import type { TaskPriority } from '~/services/dto/task-priority'
-import type { TaskGroup } from '~/services/dto/task-group'
+import type { Task } from '~/modules/project-management/services/dto/task'
+import type { TaskStatus } from '~/modules/project-management/services/dto/task-status'
+import type { TaskEffort } from '~/modules/project-management/services/dto/task-effort'
+import type { TaskPriority } from '~/modules/project-management/services/dto/task-priority'
+import type { TaskGroup } from '~/modules/project-management/services/dto/task-group'
 import type { UserData } from '~/services/dto/user-data'
-import type { Project } from '~/services/dto/project'
+import type { Project } from '~/modules/project-management/services/dto/project'
 
 const props = withDefaults(defineProps<{
     selectedCount: number
diff --git a/frontend/components/task/TaskCard.vue b/frontend/modules/project-management/components/TaskCard.vue
similarity index 98%
rename from frontend/components/task/TaskCard.vue
rename to frontend/modules/project-management/components/TaskCard.vue
index 595b319..777087c 100644
--- a/frontend/components/task/TaskCard.vue
+++ b/frontend/modules/project-management/components/TaskCard.vue
@@ -102,7 +102,7 @@
 </template>
 
 <script setup lang="ts">
-import type { Task } from '~/services/dto/task'
+import type { Task } from '~/modules/project-management/services/dto/task'
 
 const props = withDefaults(defineProps<{
     task: Task
diff --git a/frontend/components/task/TaskDocumentList.vue b/frontend/modules/project-management/components/TaskDocumentList.vue
similarity index 95%
rename from frontend/components/task/TaskDocumentList.vue
rename to frontend/modules/project-management/components/TaskDocumentList.vue
index b4aed6b..acb94ab 100644
--- a/frontend/components/task/TaskDocumentList.vue
+++ b/frontend/modules/project-management/components/TaskDocumentList.vue
@@ -60,8 +60,8 @@
 </template>
 
 <script setup lang="ts">
-import type { TaskDocument } from '~/services/dto/task-document'
-import { useTaskDocumentService } from '~/services/task-documents'
+import type { TaskDocument } from '~/modules/project-management/services/dto/task-document'
+import { useTaskDocumentService } from '~/modules/project-management/services/task-documents'
 import { formatFileSize } from '~/utils/format'
 
 defineProps<{
diff --git a/frontend/components/task/TaskDocumentPreview.vue b/frontend/modules/project-management/components/TaskDocumentPreview.vue
similarity index 97%
rename from frontend/components/task/TaskDocumentPreview.vue
rename to frontend/modules/project-management/components/TaskDocumentPreview.vue
index e6e4327..d40ed8b 100644
--- a/frontend/components/task/TaskDocumentPreview.vue
+++ b/frontend/modules/project-management/components/TaskDocumentPreview.vue
@@ -121,8 +121,8 @@
 </template>
 
 <script setup lang="ts">
-import type { TaskDocument } from '~/services/dto/task-document'
-import { useTaskDocumentService } from '~/services/task-documents'
+import type { TaskDocument } from '~/modules/project-management/services/dto/task-document'
+import { useTaskDocumentService } from '~/modules/project-management/services/task-documents'
 import { formatFileSize } from '~/utils/format'
 import { copyToClipboard } from '~/utils/clipboard'
 
diff --git a/frontend/components/task/TaskDocumentShareLinker.vue b/frontend/modules/project-management/components/TaskDocumentShareLinker.vue
similarity index 98%
rename from frontend/components/task/TaskDocumentShareLinker.vue
rename to frontend/modules/project-management/components/TaskDocumentShareLinker.vue
index 695db5c..33008e2 100644
--- a/frontend/components/task/TaskDocumentShareLinker.vue
+++ b/frontend/modules/project-management/components/TaskDocumentShareLinker.vue
@@ -58,7 +58,7 @@
 <script setup lang="ts">
 import type { Breadcrumb, FileEntry } from '~/services/dto/share'
 import { useShareService } from '~/services/share'
-import { useTaskDocumentService } from '~/services/task-documents'
+import { useTaskDocumentService } from '~/modules/project-management/services/task-documents'
 import { formatFileSize } from '~/utils/format'
 
 const props = defineProps<{
diff --git a/frontend/components/task/TaskDocumentUpload.vue b/frontend/modules/project-management/components/TaskDocumentUpload.vue
similarity index 97%
rename from frontend/components/task/TaskDocumentUpload.vue
rename to frontend/modules/project-management/components/TaskDocumentUpload.vue
index 853850a..d818665 100644
--- a/frontend/components/task/TaskDocumentUpload.vue
+++ b/frontend/modules/project-management/components/TaskDocumentUpload.vue
@@ -46,7 +46,7 @@
 </template>
 
 <script setup lang="ts">
-import { useTaskDocumentService } from '~/services/task-documents'
+import { useTaskDocumentService } from '~/modules/project-management/services/task-documents'
 
 const props = defineProps<{
     taskId?: number
diff --git a/frontend/components/task/TaskEffortDrawer.vue b/frontend/modules/project-management/components/TaskEffortDrawer.vue
similarity index 91%
rename from frontend/components/task/TaskEffortDrawer.vue
rename to frontend/modules/project-management/components/TaskEffortDrawer.vue
index ac186be..a0794cd 100644
--- a/frontend/components/task/TaskEffortDrawer.vue
+++ b/frontend/modules/project-management/components/TaskEffortDrawer.vue
@@ -25,8 +25,8 @@
 </template>
 
 <script setup lang="ts">
-import type { TaskEffort, TaskEffortWrite } from '~/services/dto/task-effort'
-import { useTaskEffortService } from '~/services/task-efforts'
+import type { TaskEffort, TaskEffortWrite } from '~/modules/project-management/services/dto/task-effort'
+import { useTaskEffortService } from '~/modules/project-management/services/task-efforts'
 
 const props = defineProps<{
     modelValue: boolean
diff --git a/frontend/components/task/TaskGitSection.vue b/frontend/modules/project-management/components/TaskGitSection.vue
similarity index 99%
rename from frontend/components/task/TaskGitSection.vue
rename to frontend/modules/project-management/components/TaskGitSection.vue
index 0e6dffc..6a4216a 100644
--- a/frontend/components/task/TaskGitSection.vue
+++ b/frontend/modules/project-management/components/TaskGitSection.vue
@@ -226,7 +226,7 @@
 </template>
 
 <script setup lang="ts">
-import type { Task } from '~/services/dto/task'
+import type { Task } from '~/modules/project-management/services/dto/task'
 import type { GiteaBranch, GiteaPullRequest } from '~/services/dto/gitea'
 import { useGiteaService } from '~/services/gitea'
 import { copyToClipboard } from '~/utils/clipboard'
diff --git a/frontend/components/task/TaskGroupDrawer.vue b/frontend/modules/project-management/components/TaskGroupDrawer.vue
similarity index 93%
rename from frontend/components/task/TaskGroupDrawer.vue
rename to frontend/modules/project-management/components/TaskGroupDrawer.vue
index 2d64266..4f52523 100644
--- a/frontend/components/task/TaskGroupDrawer.vue
+++ b/frontend/modules/project-management/components/TaskGroupDrawer.vue
@@ -56,10 +56,10 @@
 </template>
 
 <script setup lang="ts">
-import type { TaskGroup, TaskGroupWrite } from '~/services/dto/task-group'
-import type { Task } from '~/services/dto/task'
-import { useTaskGroupService } from '~/services/task-groups'
-import { useTaskService } from '~/services/tasks'
+import type { TaskGroup, TaskGroupWrite } from '~/modules/project-management/services/dto/task-group'
+import type { Task } from '~/modules/project-management/services/dto/task'
+import { useTaskGroupService } from '~/modules/project-management/services/task-groups'
+import { useTaskService } from '~/modules/project-management/services/tasks'
 
 const props = defineProps<{
     modelValue: boolean
diff --git a/frontend/components/task/TaskListItem.vue b/frontend/modules/project-management/components/TaskListItem.vue
similarity index 98%
rename from frontend/components/task/TaskListItem.vue
rename to frontend/modules/project-management/components/TaskListItem.vue
index e2f5d5f..e978073 100644
--- a/frontend/components/task/TaskListItem.vue
+++ b/frontend/modules/project-management/components/TaskListItem.vue
@@ -110,7 +110,7 @@
 </template>
 
 <script setup lang="ts">
-import type { Task } from '~/services/dto/task'
+import type { Task } from '~/modules/project-management/services/dto/task'
 
 const props = withDefaults(defineProps<{
     task: Task
diff --git a/frontend/components/task/TaskModal.vue b/frontend/modules/project-management/components/TaskModal.vue
similarity index 98%
rename from frontend/components/task/TaskModal.vue
rename to frontend/modules/project-management/components/TaskModal.vue
index 5930be3..62e6309 100644
--- a/frontend/components/task/TaskModal.vue
+++ b/frontend/modules/project-management/components/TaskModal.vue
@@ -536,21 +536,21 @@
 </template>
 
 <script setup lang="ts">
-import type { Task, TaskWrite } from '~/services/dto/task'
-import type { TaskDocument } from '~/services/dto/task-document'
+import type { Task, TaskWrite } from '~/modules/project-management/services/dto/task'
+import type { TaskDocument } from '~/modules/project-management/services/dto/task-document'
 import { useGiteaService } from '~/services/gitea'
-import { useTaskDocumentService } from '~/services/task-documents'
+import { useTaskDocumentService } from '~/modules/project-management/services/task-documents'
 import ConfirmDeleteDocumentModal from '~/components/ui/ConfirmDeleteDocumentModal.vue'
-import type { TaskStatus } from '~/services/dto/task-status'
-import type { TaskEffort } from '~/services/dto/task-effort'
-import type { TaskPriority } from '~/services/dto/task-priority'
-import type { TaskTag } from '~/services/dto/task-tag'
-import type { TaskGroup } from '~/services/dto/task-group'
+import type { TaskStatus } from '~/modules/project-management/services/dto/task-status'
+import type { TaskEffort } from '~/modules/project-management/services/dto/task-effort'
+import type { TaskPriority } from '~/modules/project-management/services/dto/task-priority'
+import type { TaskTag } from '~/modules/project-management/services/dto/task-tag'
+import type { TaskGroup } from '~/modules/project-management/services/dto/task-group'
 import type { UserData } from '~/services/dto/user-data'
-import { useTaskService } from '~/services/tasks'
-import { useTaskRecurrenceService } from '~/services/task-recurrences'
+import { useTaskService } from '~/modules/project-management/services/tasks'
+import { useTaskRecurrenceService } from '~/modules/project-management/services/task-recurrences'
 
-import type { Project } from '~/services/dto/project'
+import type { Project } from '~/modules/project-management/services/dto/project'
 import { useMailService } from '~/services/mail'
 import type { MailMessageHeaderDto } from '~/services/dto/mail'
 
diff --git a/frontend/components/task/TaskPriorityDrawer.vue b/frontend/modules/project-management/components/TaskPriorityDrawer.vue
similarity index 92%
rename from frontend/components/task/TaskPriorityDrawer.vue
rename to frontend/modules/project-management/components/TaskPriorityDrawer.vue
index 627abe4..dd9e9b8 100644
--- a/frontend/components/task/TaskPriorityDrawer.vue
+++ b/frontend/modules/project-management/components/TaskPriorityDrawer.vue
@@ -28,8 +28,8 @@
 </template>
 
 <script setup lang="ts">
-import type { TaskPriority, TaskPriorityWrite } from '~/services/dto/task-priority'
-import { useTaskPriorityService } from '~/services/task-priorities'
+import type { TaskPriority, TaskPriorityWrite } from '~/modules/project-management/services/dto/task-priority'
+import { useTaskPriorityService } from '~/modules/project-management/services/task-priorities'
 
 const props = defineProps<{
     modelValue: boolean
diff --git a/frontend/components/task/TaskTagDrawer.vue b/frontend/modules/project-management/components/TaskTagDrawer.vue
similarity index 93%
rename from frontend/components/task/TaskTagDrawer.vue
rename to frontend/modules/project-management/components/TaskTagDrawer.vue
index 01ec2e1..16dc44e 100644
--- a/frontend/components/task/TaskTagDrawer.vue
+++ b/frontend/modules/project-management/components/TaskTagDrawer.vue
@@ -28,8 +28,8 @@
 </template>
 
 <script setup lang="ts">
-import type { TaskTag, TaskTagWrite } from '~/services/dto/task-tag'
-import { useTaskTagService } from '~/services/task-tags'
+import type { TaskTag, TaskTagWrite } from '~/modules/project-management/services/dto/task-tag'
+import { useTaskTagService } from '~/modules/project-management/services/task-tags'
 
 const props = defineProps<{
     modelValue: boolean
diff --git a/frontend/modules/project-management/nuxt.config.ts b/frontend/modules/project-management/nuxt.config.ts
new file mode 100644
index 0000000..268da7f
--- /dev/null
+++ b/frontend/modules/project-management/nuxt.config.ts
@@ -0,0 +1 @@
+export default defineNuxtConfig({})
diff --git a/frontend/pages/my-tasks.vue b/frontend/modules/project-management/pages/my-tasks.vue
similarity index 93%
rename from frontend/pages/my-tasks.vue
rename to frontend/modules/project-management/pages/my-tasks.vue
index 4172272..35bb536 100644
--- a/frontend/pages/my-tasks.vue
+++ b/frontend/modules/project-management/pages/my-tasks.vue
@@ -1,22 +1,22 @@
 <script setup lang="ts">
-import type { Task } from '~/services/dto/task'
-import type { TaskStatus } from '~/services/dto/task-status'
-import type { TaskEffort } from '~/services/dto/task-effort'
-import type { TaskPriority } from '~/services/dto/task-priority'
-import type { TaskTag } from '~/services/dto/task-tag'
-import type { TaskGroup } from '~/services/dto/task-group'
+import type { Task } from '~/modules/project-management/services/dto/task'
+import type { TaskStatus } from '~/modules/project-management/services/dto/task-status'
+import type { TaskEffort } from '~/modules/project-management/services/dto/task-effort'
+import type { TaskPriority } from '~/modules/project-management/services/dto/task-priority'
+import type { TaskTag } from '~/modules/project-management/services/dto/task-tag'
+import type { TaskGroup } from '~/modules/project-management/services/dto/task-group'
 import type { UserData } from '~/services/dto/user-data'
-import type { Project } from '~/services/dto/project'
-import type { StatusCategory } from '~/services/dto/workflow'
-import { STATUS_CATEGORY_LABEL, STATUS_CATEGORY_COLOR, contrastText } from '~/services/dto/workflow'
-import { useTaskService } from '~/services/tasks'
-import { useTaskStatusService } from '~/services/task-statuses'
-import { useTaskEffortService } from '~/services/task-efforts'
-import { useTaskPriorityService } from '~/services/task-priorities'
-import { useTaskTagService } from '~/services/task-tags'
-import { useTaskGroupService } from '~/services/task-groups'
+import type { Project } from '~/modules/project-management/services/dto/project'
+import type { StatusCategory } from '~/modules/project-management/services/dto/workflow'
+import { STATUS_CATEGORY_LABEL, STATUS_CATEGORY_COLOR, contrastText } from '~/modules/project-management/services/dto/workflow'
+import { useTaskService } from '~/modules/project-management/services/tasks'
+import { useTaskStatusService } from '~/modules/project-management/services/task-statuses'
+import { useTaskEffortService } from '~/modules/project-management/services/task-efforts'
+import { useTaskPriorityService } from '~/modules/project-management/services/task-priorities'
+import { useTaskTagService } from '~/modules/project-management/services/task-tags'
+import { useTaskGroupService } from '~/modules/project-management/services/task-groups'
 import { useUserService } from '~/services/users'
-import { useProjectService } from '~/services/projects'
+import { useProjectService } from '~/modules/project-management/services/projects'
 
 const { t } = useI18n()
 const route = useRoute()
diff --git a/frontend/pages/projects/[id]/archives.vue b/frontend/modules/project-management/pages/projects/[id]/archives.vue
similarity index 81%
rename from frontend/pages/projects/[id]/archives.vue
rename to frontend/modules/project-management/pages/projects/[id]/archives.vue
index f8994d6..b17dd26 100644
--- a/frontend/pages/projects/[id]/archives.vue
+++ b/frontend/modules/project-management/pages/projects/[id]/archives.vue
@@ -72,20 +72,20 @@
 </template>
 
 <script setup lang="ts">
-import type { Project } from '~/services/dto/project'
-import type { Task } from '~/services/dto/task'
-import type { TaskStatus } from '~/services/dto/task-status'
-import type { TaskEffort } from '~/services/dto/task-effort'
-import type { TaskPriority } from '~/services/dto/task-priority'
-import type { TaskTag } from '~/services/dto/task-tag'
-import type { TaskGroup } from '~/services/dto/task-group'
+import type { Project } from '~/modules/project-management/services/dto/project'
+import type { Task } from '~/modules/project-management/services/dto/task'
+import type { TaskStatus } from '~/modules/project-management/services/dto/task-status'
+import type { TaskEffort } from '~/modules/project-management/services/dto/task-effort'
+import type { TaskPriority } from '~/modules/project-management/services/dto/task-priority'
+import type { TaskTag } from '~/modules/project-management/services/dto/task-tag'
+import type { TaskGroup } from '~/modules/project-management/services/dto/task-group'
 import type { UserData } from '~/services/dto/user-data'
-import { useProjectService } from '~/services/projects'
-import { useTaskService } from '~/services/tasks'
-import { useTaskEffortService } from '~/services/task-efforts'
-import { useTaskPriorityService } from '~/services/task-priorities'
-import { useTaskTagService } from '~/services/task-tags'
-import { useTaskGroupService } from '~/services/task-groups'
+import { useProjectService } from '~/modules/project-management/services/projects'
+import { useTaskService } from '~/modules/project-management/services/tasks'
+import { useTaskEffortService } from '~/modules/project-management/services/task-efforts'
+import { useTaskPriorityService } from '~/modules/project-management/services/task-priorities'
+import { useTaskTagService } from '~/modules/project-management/services/task-tags'
+import { useTaskGroupService } from '~/modules/project-management/services/task-groups'
 import { useUserService } from '~/services/users'
 
 const route = useRoute()
diff --git a/frontend/pages/projects/[id]/groups.vue b/frontend/modules/project-management/pages/projects/[id]/groups.vue
similarity index 82%
rename from frontend/pages/projects/[id]/groups.vue
rename to frontend/modules/project-management/pages/projects/[id]/groups.vue
index ce87026..3a4f802 100644
--- a/frontend/pages/projects/[id]/groups.vue
+++ b/frontend/modules/project-management/pages/projects/[id]/groups.vue
@@ -13,8 +13,8 @@
 </template>
 
 <script setup lang="ts">
-import type { Project } from '~/services/dto/project'
-import { useProjectService } from '~/services/projects'
+import type { Project } from '~/modules/project-management/services/dto/project'
+import { useProjectService } from '~/modules/project-management/services/projects'
 
 const route = useRoute()
 const projectId = computed(() => Number(route.params.id))
diff --git a/frontend/pages/projects/[id]/index.vue b/frontend/modules/project-management/pages/projects/[id]/index.vue
similarity index 93%
rename from frontend/pages/projects/[id]/index.vue
rename to frontend/modules/project-management/pages/projects/[id]/index.vue
index 861aee3..29ca735 100644
--- a/frontend/pages/projects/[id]/index.vue
+++ b/frontend/modules/project-management/pages/projects/[id]/index.vue
@@ -207,22 +207,22 @@
 </template>
 
 <script setup lang="ts">
-import type { Project } from '~/services/dto/project'
-import type { Task } from '~/services/dto/task'
-import type { TaskStatus } from '~/services/dto/task-status'
-import type { TaskEffort } from '~/services/dto/task-effort'
-import type { TaskPriority } from '~/services/dto/task-priority'
-import type { TaskTag } from '~/services/dto/task-tag'
-import type { TaskGroup } from '~/services/dto/task-group'
+import type { Project } from '~/modules/project-management/services/dto/project'
+import type { Task } from '~/modules/project-management/services/dto/task'
+import type { TaskStatus } from '~/modules/project-management/services/dto/task-status'
+import type { TaskEffort } from '~/modules/project-management/services/dto/task-effort'
+import type { TaskPriority } from '~/modules/project-management/services/dto/task-priority'
+import type { TaskTag } from '~/modules/project-management/services/dto/task-tag'
+import type { TaskGroup } from '~/modules/project-management/services/dto/task-group'
 import type { UserData } from '~/services/dto/user-data'
 import type { Client } from '~/services/dto/client'
-import { useProjectService } from '~/services/projects'
+import { useProjectService } from '~/modules/project-management/services/projects'
 import { useClientService } from '~/services/clients'
-import { useTaskService } from '~/services/tasks'
-import { useTaskEffortService } from '~/services/task-efforts'
-import { useTaskPriorityService } from '~/services/task-priorities'
-import { useTaskTagService } from '~/services/task-tags'
-import { useTaskGroupService } from '~/services/task-groups'
+import { useTaskService } from '~/modules/project-management/services/tasks'
+import { useTaskEffortService } from '~/modules/project-management/services/task-efforts'
+import { useTaskPriorityService } from '~/modules/project-management/services/task-priorities'
+import { useTaskTagService } from '~/modules/project-management/services/task-tags'
+import { useTaskGroupService } from '~/modules/project-management/services/task-groups'
 import { useUserService } from '~/services/users'
 
 const route = useRoute()
diff --git a/frontend/pages/projects/index.vue b/frontend/modules/project-management/pages/projects/index.vue
similarity index 96%
rename from frontend/pages/projects/index.vue
rename to frontend/modules/project-management/pages/projects/index.vue
index 821b9aa..954d2ca 100644
--- a/frontend/pages/projects/index.vue
+++ b/frontend/modules/project-management/pages/projects/index.vue
@@ -76,9 +76,9 @@
 </template>
 
 <script setup lang="ts">
-import type { Project } from '~/services/dto/project'
+import type { Project } from '~/modules/project-management/services/dto/project'
 import type { Client } from '~/services/dto/client'
-import { useProjectService } from '~/services/projects'
+import { useProjectService } from '~/modules/project-management/services/projects'
 import { useClientService } from '~/services/clients'
 
 useHead({ title: 'Projets' })
diff --git a/frontend/services/dto/project.ts b/frontend/modules/project-management/services/dto/project.ts
similarity index 93%
rename from frontend/services/dto/project.ts
rename to frontend/modules/project-management/services/dto/project.ts
index 8e36770..8e160d3 100644
--- a/frontend/services/dto/project.ts
+++ b/frontend/modules/project-management/services/dto/project.ts
@@ -1,4 +1,4 @@
-import type { Client } from './client'
+import type { Client } from '~/services/dto/client'
 import type { Workflow } from './workflow'
 
 export type Project = {
diff --git a/frontend/services/dto/task-document.ts b/frontend/modules/project-management/services/dto/task-document.ts
similarity index 81%
rename from frontend/services/dto/task-document.ts
rename to frontend/modules/project-management/services/dto/task-document.ts
index e9a8886..45688a5 100644
--- a/frontend/services/dto/task-document.ts
+++ b/frontend/modules/project-management/services/dto/task-document.ts
@@ -1,4 +1,4 @@
-import type { UserData } from './user-data'
+import type { UserData } from '~/services/dto/user-data'
 
 export type TaskDocument = {
     '@id'?: string
diff --git a/frontend/services/dto/task-effort.ts b/frontend/modules/project-management/services/dto/task-effort.ts
similarity index 100%
rename from frontend/services/dto/task-effort.ts
rename to frontend/modules/project-management/services/dto/task-effort.ts
diff --git a/frontend/services/dto/task-group.ts b/frontend/modules/project-management/services/dto/task-group.ts
similarity index 100%
rename from frontend/services/dto/task-group.ts
rename to frontend/modules/project-management/services/dto/task-group.ts
diff --git a/frontend/services/dto/task-priority.ts b/frontend/modules/project-management/services/dto/task-priority.ts
similarity index 100%
rename from frontend/services/dto/task-priority.ts
rename to frontend/modules/project-management/services/dto/task-priority.ts
diff --git a/frontend/services/dto/task-recurrence.ts b/frontend/modules/project-management/services/dto/task-recurrence.ts
similarity index 100%
rename from frontend/services/dto/task-recurrence.ts
rename to frontend/modules/project-management/services/dto/task-recurrence.ts
diff --git a/frontend/services/dto/task-status.ts b/frontend/modules/project-management/services/dto/task-status.ts
similarity index 100%
rename from frontend/services/dto/task-status.ts
rename to frontend/modules/project-management/services/dto/task-status.ts
diff --git a/frontend/services/dto/task-tag.ts b/frontend/modules/project-management/services/dto/task-tag.ts
similarity index 100%
rename from frontend/services/dto/task-tag.ts
rename to frontend/modules/project-management/services/dto/task-tag.ts
diff --git a/frontend/services/dto/task.ts b/frontend/modules/project-management/services/dto/task.ts
similarity index 96%
rename from frontend/services/dto/task.ts
rename to frontend/modules/project-management/services/dto/task.ts
index d2a8114..3a20502 100644
--- a/frontend/services/dto/task.ts
+++ b/frontend/modules/project-management/services/dto/task.ts
@@ -3,7 +3,7 @@ import type { TaskEffort } from './task-effort'
 import type { TaskPriority } from './task-priority'
 import type { TaskTag } from './task-tag'
 import type { TaskGroup } from './task-group'
-import type { UserData } from './user-data'
+import type { UserData } from '~/services/dto/user-data'
 import type { Project } from './project'
 import type { TaskDocument } from './task-document'
 
diff --git a/frontend/services/dto/workflow.ts b/frontend/modules/project-management/services/dto/workflow.ts
similarity index 100%
rename from frontend/services/dto/workflow.ts
rename to frontend/modules/project-management/services/dto/workflow.ts
diff --git a/frontend/services/projects.ts b/frontend/modules/project-management/services/projects.ts
similarity index 100%
rename from frontend/services/projects.ts
rename to frontend/modules/project-management/services/projects.ts
diff --git a/frontend/services/task-documents.ts b/frontend/modules/project-management/services/task-documents.ts
similarity index 100%
rename from frontend/services/task-documents.ts
rename to frontend/modules/project-management/services/task-documents.ts
diff --git a/frontend/services/task-efforts.ts b/frontend/modules/project-management/services/task-efforts.ts
similarity index 100%
rename from frontend/services/task-efforts.ts
rename to frontend/modules/project-management/services/task-efforts.ts
diff --git a/frontend/services/task-groups.ts b/frontend/modules/project-management/services/task-groups.ts
similarity index 100%
rename from frontend/services/task-groups.ts
rename to frontend/modules/project-management/services/task-groups.ts
diff --git a/frontend/services/task-priorities.ts b/frontend/modules/project-management/services/task-priorities.ts
similarity index 100%
rename from frontend/services/task-priorities.ts
rename to frontend/modules/project-management/services/task-priorities.ts
diff --git a/frontend/services/task-recurrences.ts b/frontend/modules/project-management/services/task-recurrences.ts
similarity index 100%
rename from frontend/services/task-recurrences.ts
rename to frontend/modules/project-management/services/task-recurrences.ts
diff --git a/frontend/services/task-statuses.ts b/frontend/modules/project-management/services/task-statuses.ts
similarity index 100%
rename from frontend/services/task-statuses.ts
rename to frontend/modules/project-management/services/task-statuses.ts
diff --git a/frontend/services/task-tags.ts b/frontend/modules/project-management/services/task-tags.ts
similarity index 100%
rename from frontend/services/task-tags.ts
rename to frontend/modules/project-management/services/task-tags.ts
diff --git a/frontend/services/tasks.ts b/frontend/modules/project-management/services/tasks.ts
similarity index 100%
rename from frontend/services/tasks.ts
rename to frontend/modules/project-management/services/tasks.ts
diff --git a/frontend/services/workflows.ts b/frontend/modules/project-management/services/workflows.ts
similarity index 100%
rename from frontend/services/workflows.ts
rename to frontend/modules/project-management/services/workflows.ts
diff --git a/frontend/modules/time-tracking/components/TimeEntryDrawer.vue b/frontend/modules/time-tracking/components/TimeEntryDrawer.vue
index e078e13..0f002a1 100644
--- a/frontend/modules/time-tracking/components/TimeEntryDrawer.vue
+++ b/frontend/modules/time-tracking/components/TimeEntryDrawer.vue
@@ -126,8 +126,8 @@
 <script setup lang="ts">
 import type { TimeEntry, TimeEntryWrite } from '~/modules/time-tracking/services/dto/time-entry'
 import type { UserData } from '~/services/dto/user-data'
-import type { Project } from '~/services/dto/project'
-import type { TaskTag } from '~/services/dto/task-tag'
+import type { Project } from '~/modules/project-management/services/dto/project'
+import type { TaskTag } from '~/modules/project-management/services/dto/task-tag'
 import { useTimeEntryService } from '~/modules/time-tracking/services/time-entries'
 
 const props = defineProps<{
diff --git a/frontend/modules/time-tracking/components/TimeTrackingExportDrawer.vue b/frontend/modules/time-tracking/components/TimeTrackingExportDrawer.vue
index abeeb8e..77d4e7e 100644
--- a/frontend/modules/time-tracking/components/TimeTrackingExportDrawer.vue
+++ b/frontend/modules/time-tracking/components/TimeTrackingExportDrawer.vue
@@ -108,8 +108,8 @@
 
 <script setup lang="ts">
 import type { UserData } from '~/services/dto/user-data'
-import type { Project } from '~/services/dto/project'
-import type { TaskTag } from '~/services/dto/task-tag'
+import type { Project } from '~/modules/project-management/services/dto/project'
+import type { TaskTag } from '~/modules/project-management/services/dto/task-tag'
 import type { Client } from '~/services/dto/client'
 
 const props = defineProps<{
diff --git a/frontend/modules/time-tracking/pages/time-tracking.vue b/frontend/modules/time-tracking/pages/time-tracking.vue
index e2afcd9..fa29935 100644
--- a/frontend/modules/time-tracking/pages/time-tracking.vue
+++ b/frontend/modules/time-tracking/pages/time-tracking.vue
@@ -152,8 +152,8 @@
 <script setup lang="ts">
 import type { TimeEntry } from '~/modules/time-tracking/services/dto/time-entry'
 import type { UserData } from '~/services/dto/user-data'
-import type { Project } from '~/services/dto/project'
-import type { TaskTag } from '~/services/dto/task-tag'
+import type { Project } from '~/modules/project-management/services/dto/project'
+import type { TaskTag } from '~/modules/project-management/services/dto/task-tag'
 import type { Client } from '~/services/dto/client'
 import { useTimeEntryService } from '~/modules/time-tracking/services/time-entries'
 import type { HydraCollection } from '~/utils/api'
diff --git a/frontend/modules/time-tracking/services/dto/time-entry.ts b/frontend/modules/time-tracking/services/dto/time-entry.ts
index f129e51..3f4275e 100644
--- a/frontend/modules/time-tracking/services/dto/time-entry.ts
+++ b/frontend/modules/time-tracking/services/dto/time-entry.ts
@@ -1,7 +1,7 @@
 import type { UserData } from '~/services/dto/user-data'
-import type { Project } from '~/services/dto/project'
-import type { Task } from '~/services/dto/task'
-import type { TaskTag } from '~/services/dto/task-tag'
+import type { Project } from '~/modules/project-management/services/dto/project'
+import type { Task } from '~/modules/project-management/services/dto/task'
+import type { TaskTag } from '~/modules/project-management/services/dto/task-tag'
 
 export type TimeEntry = {
     id: number
diff --git a/frontend/modules/time-tracking/stores/timer.ts b/frontend/modules/time-tracking/stores/timer.ts
index ec6253a..6462747 100644
--- a/frontend/modules/time-tracking/stores/timer.ts
+++ b/frontend/modules/time-tracking/stores/timer.ts
@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
 import type { TimeEntry } from '~/modules/time-tracking/services/dto/time-entry'
-import type { Task } from '~/services/dto/task'
+import type { Task } from '~/modules/project-management/services/dto/task'
 import { useTimeEntryService } from '~/modules/time-tracking/services/time-entries'
 
 export const useTimerStore = defineStore('timer', () => {
diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue
index b55c37c..96b1d67 100644
--- a/frontend/pages/index.vue
+++ b/frontend/pages/index.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
 import { Doughnut, Bar, Line } from 'vue-chartjs'
-import type { Task } from '~/services/dto/task'
-import type { TaskStatus } from '~/services/dto/task-status'
-import type { TaskPriority } from '~/services/dto/task-priority'
+import type { Task } from '~/modules/project-management/services/dto/task'
+import type { TaskStatus } from '~/modules/project-management/services/dto/task-status'
+import type { TaskPriority } from '~/modules/project-management/services/dto/task-priority'
 import type { TimeEntry } from '~/modules/time-tracking/services/dto/time-entry'
-import type { Project } from '~/services/dto/project'
+import type { Project } from '~/modules/project-management/services/dto/project'
 import type { UserData } from '~/services/dto/user-data'
-import { useTaskService } from '~/services/tasks'
-import { useTaskStatusService } from '~/services/task-statuses'
-import { useTaskPriorityService } from '~/services/task-priorities'
+import { useTaskService } from '~/modules/project-management/services/tasks'
+import { useTaskStatusService } from '~/modules/project-management/services/task-statuses'
+import { useTaskPriorityService } from '~/modules/project-management/services/task-priorities'
 import { useTimeEntryService } from '~/modules/time-tracking/services/time-entries'
-import { useProjectService } from '~/services/projects'
+import { useProjectService } from '~/modules/project-management/services/projects'
 import { useUserService } from '~/services/users'
 
 const { t } = useI18n()
diff --git a/frontend/pages/mail.vue b/frontend/pages/mail.vue
index 6f79de7..9673b03 100644
--- a/frontend/pages/mail.vue
+++ b/frontend/pages/mail.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { Task } from '~/services/dto/task'
+import type { Task } from '~/modules/project-management/services/dto/task'
 import { useMailStore } from '~/stores/mail'
 
 const { t } = useI18n()
diff --git a/frontend/services/mail.ts b/frontend/services/mail.ts
index 2f44422..c3215c7 100644
--- a/frontend/services/mail.ts
+++ b/frontend/services/mail.ts
@@ -12,7 +12,7 @@ import type {
     MailLinkTaskInput,
     MailSyncResultDto,
 } from './dto/mail'
-import type { Task } from './dto/task'
+import type { Task } from '~/modules/project-management/services/dto/task'
 
 type BackendMailMessage = {
     id: number