diff --git a/frontend/components/time-tracking/TimeEntryBlock.vue b/frontend/modules/time-tracking/components/TimeEntryBlock.vue
similarity index 99%
rename from frontend/components/time-tracking/TimeEntryBlock.vue
rename to frontend/modules/time-tracking/components/TimeEntryBlock.vue
index ffdb7d7..560ccd3 100644
--- a/frontend/components/time-tracking/TimeEntryBlock.vue
+++ b/frontend/modules/time-tracking/components/TimeEntryBlock.vue
@@ -64,7 +64,7 @@
 </template>
 
 <script setup lang="ts">
-import type { TimeEntry } from '~/services/dto/time-entry'
+import type { TimeEntry } from '~/modules/time-tracking/services/dto/time-entry'
 
 const props = defineProps<{
     entry: TimeEntry
diff --git a/frontend/components/time-tracking/TimeEntryContextMenu.vue b/frontend/modules/time-tracking/components/TimeEntryContextMenu.vue
similarity index 96%
rename from frontend/components/time-tracking/TimeEntryContextMenu.vue
rename to frontend/modules/time-tracking/components/TimeEntryContextMenu.vue
index 6088ed3..ada7403 100644
--- a/frontend/components/time-tracking/TimeEntryContextMenu.vue
+++ b/frontend/modules/time-tracking/components/TimeEntryContextMenu.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script setup lang="ts">
-import type { TimeEntry } from '~/services/dto/time-entry'
+import type { TimeEntry } from '~/modules/time-tracking/services/dto/time-entry'
 
 const props = defineProps<{
     visible: boolean
diff --git a/frontend/components/time-tracking/TimeEntryDrawer.vue b/frontend/modules/time-tracking/components/TimeEntryDrawer.vue
similarity index 98%
rename from frontend/components/time-tracking/TimeEntryDrawer.vue
rename to frontend/modules/time-tracking/components/TimeEntryDrawer.vue
index f9660b5..e078e13 100644
--- a/frontend/components/time-tracking/TimeEntryDrawer.vue
+++ b/frontend/modules/time-tracking/components/TimeEntryDrawer.vue
@@ -124,11 +124,11 @@
 </template>
 
 <script setup lang="ts">
-import type { TimeEntry, TimeEntryWrite } from '~/services/dto/time-entry'
+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 { useTimeEntryService } from '~/services/time-entries'
+import { useTimeEntryService } from '~/modules/time-tracking/services/time-entries'
 
 const props = defineProps<{
     modelValue: boolean
diff --git a/frontend/components/time-tracking/TimeEntryList.vue b/frontend/modules/time-tracking/components/TimeEntryList.vue
similarity index 98%
rename from frontend/components/time-tracking/TimeEntryList.vue
rename to frontend/modules/time-tracking/components/TimeEntryList.vue
index a727593..9913e0d 100644
--- a/frontend/components/time-tracking/TimeEntryList.vue
+++ b/frontend/modules/time-tracking/components/TimeEntryList.vue
@@ -67,7 +67,7 @@
 </template>
 
 <script setup lang="ts">
-import type { TimeEntry } from '~/services/dto/time-entry'
+import type { TimeEntry } from '~/modules/time-tracking/services/dto/time-entry'
 import { stripRichText } from '~/utils/format'
 
 const props = defineProps<{
diff --git a/frontend/components/time-tracking/TimeTrackingCalendar.vue b/frontend/modules/time-tracking/components/TimeTrackingCalendar.vue
similarity index 99%
rename from frontend/components/time-tracking/TimeTrackingCalendar.vue
rename to frontend/modules/time-tracking/components/TimeTrackingCalendar.vue
index 4b32e29..2652309 100644
--- a/frontend/components/time-tracking/TimeTrackingCalendar.vue
+++ b/frontend/modules/time-tracking/components/TimeTrackingCalendar.vue
@@ -150,7 +150,7 @@
 </template>
 
 <script setup lang="ts">
-import type { TimeEntry } from '~/services/dto/time-entry'
+import type { TimeEntry } from '~/modules/time-tracking/services/dto/time-entry'
 import { useAbsenceService } from '~/services/absences'
 
 const { t } = useI18n()
diff --git a/frontend/components/time-tracking/TimeTrackingExportDrawer.vue b/frontend/modules/time-tracking/components/TimeTrackingExportDrawer.vue
similarity index 100%
rename from frontend/components/time-tracking/TimeTrackingExportDrawer.vue
rename to frontend/modules/time-tracking/components/TimeTrackingExportDrawer.vue
diff --git a/frontend/modules/time-tracking/nuxt.config.ts b/frontend/modules/time-tracking/nuxt.config.ts
new file mode 100644
index 0000000..268da7f
--- /dev/null
+++ b/frontend/modules/time-tracking/nuxt.config.ts
@@ -0,0 +1 @@
+export default defineNuxtConfig({})
diff --git a/frontend/pages/time-tracking.vue b/frontend/modules/time-tracking/pages/time-tracking.vue
similarity index 98%
rename from frontend/pages/time-tracking.vue
rename to frontend/modules/time-tracking/pages/time-tracking.vue
index d740b12..e2afcd9 100644
--- a/frontend/pages/time-tracking.vue
+++ b/frontend/modules/time-tracking/pages/time-tracking.vue
@@ -150,12 +150,12 @@
 </template>
 
 <script setup lang="ts">
-import type { TimeEntry } from '~/services/dto/time-entry'
+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 { Client } from '~/services/dto/client'
-import { useTimeEntryService } from '~/services/time-entries'
+import { useTimeEntryService } from '~/modules/time-tracking/services/time-entries'
 import type { HydraCollection } from '~/utils/api'
 import { extractHydraMembers } from '~/utils/api'
 
diff --git a/frontend/services/dto/time-entry.ts b/frontend/modules/time-tracking/services/dto/time-entry.ts
similarity index 69%
rename from frontend/services/dto/time-entry.ts
rename to frontend/modules/time-tracking/services/dto/time-entry.ts
index 991d0fc..f129e51 100644
--- a/frontend/services/dto/time-entry.ts
+++ b/frontend/modules/time-tracking/services/dto/time-entry.ts
@@ -1,7 +1,7 @@
-import type { UserData } from './user-data'
-import type { Project } from './project'
-import type { Task } from './task'
-import type { TaskTag } from './task-tag'
+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'
 
 export type TimeEntry = {
     id: number
diff --git a/frontend/services/time-entries.ts b/frontend/modules/time-tracking/services/time-entries.ts
similarity index 100%
rename from frontend/services/time-entries.ts
rename to frontend/modules/time-tracking/services/time-entries.ts
diff --git a/frontend/stores/timer.ts b/frontend/modules/time-tracking/stores/timer.ts
similarity index 95%
rename from frontend/stores/timer.ts
rename to frontend/modules/time-tracking/stores/timer.ts
index 28d5688..ec6253a 100644
--- a/frontend/stores/timer.ts
+++ b/frontend/modules/time-tracking/stores/timer.ts
@@ -1,7 +1,7 @@
 import { defineStore } from 'pinia'
-import type { TimeEntry } from '~/services/dto/time-entry'
+import type { TimeEntry } from '~/modules/time-tracking/services/dto/time-entry'
 import type { Task } from '~/services/dto/task'
-import { useTimeEntryService } from '~/services/time-entries'
+import { useTimeEntryService } from '~/modules/time-tracking/services/time-entries'
 
 export const useTimerStore = defineStore('timer', () => {
     const activeEntry = ref<TimeEntry | null>(null)
diff --git a/frontend/pages/index.vue b/frontend/pages/index.vue
index 684631b..b55c37c 100644
--- a/frontend/pages/index.vue
+++ b/frontend/pages/index.vue
@@ -3,13 +3,13 @@ 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 { TimeEntry } from '~/services/dto/time-entry'
+import type { TimeEntry } from '~/modules/time-tracking/services/dto/time-entry'
 import type { Project } from '~/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 { useTimeEntryService } from '~/services/time-entries'
+import { useTimeEntryService } from '~/modules/time-tracking/services/time-entries'
 import { useProjectService } from '~/services/projects'
 import { useUserService } from '~/services/users'