diff --git a/src/use-cases/task/components/NewTaskForm.test.ts b/src/modules/task/components/NewTaskForm.test.ts
similarity index 100%
rename from src/use-cases/task/components/NewTaskForm.test.ts
rename to src/modules/task/components/NewTaskForm.test.ts
diff --git a/src/use-cases/task/components/NewTaskForm.vue b/src/modules/task/components/NewTaskForm.vue
similarity index 100%
rename from src/use-cases/task/components/NewTaskForm.vue
rename to src/modules/task/components/NewTaskForm.vue
diff --git a/src/use-cases/task/components/StepInput.test.ts b/src/modules/task/components/StepInput.test.ts
similarity index 100%
rename from src/use-cases/task/components/StepInput.test.ts
rename to src/modules/task/components/StepInput.test.ts
diff --git a/src/use-cases/task/components/StepInput.vue b/src/modules/task/components/StepInput.vue
similarity index 100%
rename from src/use-cases/task/components/StepInput.vue
rename to src/modules/task/components/StepInput.vue
diff --git a/src/use-cases/task/components/TaskList.vue b/src/modules/task/components/TaskList.vue
similarity index 87%
rename from src/use-cases/task/components/TaskList.vue
rename to src/modules/task/components/TaskList.vue
index 91599ad..09916a4 100644
--- a/src/use-cases/task/components/TaskList.vue
+++ b/src/modules/task/components/TaskList.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
+import { useTaskStore } from '@/modules/task/stores/useTask.store'
 import { formatDate } from '@/shared/format-date'
-import { useTaskStore } from '@/use-cases/task/stores/useTask.store'
 
 const taskStore = useTaskStore()
 </script>
diff --git a/src/use-cases/task/infra/adaptStepsToTextarea.test.ts b/src/modules/task/infra/adaptStepsToTextarea.test.ts
similarity index 100%
rename from src/use-cases/task/infra/adaptStepsToTextarea.test.ts
rename to src/modules/task/infra/adaptStepsToTextarea.test.ts
diff --git a/src/use-cases/task/infra/adaptStepsToTextarea.ts b/src/modules/task/infra/adaptStepsToTextarea.ts
similarity index 100%
rename from src/use-cases/task/infra/adaptStepsToTextarea.ts
rename to src/modules/task/infra/adaptStepsToTextarea.ts
diff --git a/src/use-cases/task/interfaces/result.ts b/src/modules/task/interfaces/result.ts
similarity index 100%
rename from src/use-cases/task/interfaces/result.ts
rename to src/modules/task/interfaces/result.ts
diff --git a/src/use-cases/task/interfaces/stepable.ts b/src/modules/task/interfaces/stepable.ts
similarity index 100%
rename from src/use-cases/task/interfaces/stepable.ts
rename to src/modules/task/interfaces/stepable.ts
diff --git a/src/use-cases/task/interfaces/taskable.ts b/src/modules/task/interfaces/taskable.ts
similarity index 62%
rename from src/use-cases/task/interfaces/taskable.ts
rename to src/modules/task/interfaces/taskable.ts
index fe1b10f..10a4c64 100644
--- a/src/use-cases/task/interfaces/taskable.ts
+++ b/src/modules/task/interfaces/taskable.ts
@@ -1,4 +1,4 @@
-import type { Stepable } from '@/use-cases/task/interfaces/stepable'
+import type { Stepable } from '@/modules/task/interfaces/stepable'
 
 export interface Taskable {
   id: string
diff --git a/src/use-cases/task/models/step.fixture.ts b/src/modules/task/models/step.fixture.ts
similarity index 72%
rename from src/use-cases/task/models/step.fixture.ts
rename to src/modules/task/models/step.fixture.ts
index 5875b83..211b4e2 100644
--- a/src/use-cases/task/models/step.fixture.ts
+++ b/src/modules/task/models/step.fixture.ts
@@ -1,5 +1,5 @@
-import type { Stepable } from '@/use-cases/task/interfaces/stepable'
-import { Step } from '@/use-cases/task/models/step'
+import type { Stepable } from '@/modules/task/interfaces/stepable'
+import { Step } from '@/modules/task/models/step'
 import { faker } from '@faker-js/faker'
 
 export const createStepFixture = (partialStep?: Partial<Stepable>) =>
diff --git a/src/use-cases/task/models/step.ts b/src/modules/task/models/step.ts
similarity index 83%
rename from src/use-cases/task/models/step.ts
rename to src/modules/task/models/step.ts
index 09951f9..80449d1 100644
--- a/src/use-cases/task/models/step.ts
+++ b/src/modules/task/models/step.ts
@@ -1,4 +1,4 @@
-import type { Stepable } from '@/use-cases/task/interfaces/stepable'
+import type { Stepable } from '@/modules/task/interfaces/stepable'
 
 export class Step implements Stepable {
   constructor(
diff --git a/src/use-cases/task/models/task.fixture.ts b/src/modules/task/models/task.fixture.ts
similarity index 100%
rename from src/use-cases/task/models/task.fixture.ts
rename to src/modules/task/models/task.fixture.ts
diff --git a/src/use-cases/task/models/task.test.ts b/src/modules/task/models/task.test.ts
similarity index 89%
rename from src/use-cases/task/models/task.test.ts
rename to src/modules/task/models/task.test.ts
index 9280e8f..064a0a2 100644
--- a/src/use-cases/task/models/task.test.ts
+++ b/src/modules/task/models/task.test.ts
@@ -1,6 +1,6 @@
-import type { Taskable } from '@/use-cases/task/interfaces/taskable'
-import { createStepFixture } from '@/use-cases/task/models/step.fixture'
-import { Task } from '@/use-cases/task/models/task'
+import type { Taskable } from '@/modules/task/interfaces/taskable'
+import { createStepFixture } from '@/modules/task/models/step.fixture'
+import { Task } from '@/modules/task/models/task'
 import { faker } from '@faker-js/faker'
 import { describe, expect, it } from 'vitest'
 
diff --git a/src/use-cases/task/models/task.ts b/src/modules/task/models/task.ts
similarity index 83%
rename from src/use-cases/task/models/task.ts
rename to src/modules/task/models/task.ts
index 7d7500e..75d2adc 100644
--- a/src/use-cases/task/models/task.ts
+++ b/src/modules/task/models/task.ts
@@ -1,6 +1,6 @@
-import type { Stepable } from '@/use-cases/task/interfaces/stepable'
-import type { Taskable } from '@/use-cases/task/interfaces/taskable'
-import { Step } from '@/use-cases/task/models/step'
+import type { Stepable } from '@/modules/task/interfaces/stepable'
+import type { Taskable } from '@/modules/task/interfaces/taskable'
+import { Step } from '@/modules/task/models/step'
 
 export class Task implements Taskable {
   public date = new Date()
diff --git a/src/use-cases/task/stores/useTask.store.ts b/src/modules/task/stores/useTask.store.ts
similarity index 100%
rename from src/use-cases/task/stores/useTask.store.ts
rename to src/modules/task/stores/useTask.store.ts
diff --git a/src/tests/utils.ts b/src/tests/utils.ts
index 52b5c64..9f1f969 100644
--- a/src/tests/utils.ts
+++ b/src/tests/utils.ts
@@ -1,6 +1,6 @@
+import { createTaskFixture } from '@/modules/task/models/task.fixture'
+import type { TaskStoreState } from '@/modules/task/stores/useTask.store'
 import { router } from '@/router'
-import { createTaskFixture } from '@/use-cases/task/models/task.fixture'
-import type { TaskStoreState } from '@/use-cases/task/stores/useTask.store'
 import { createTestingPinia } from '@pinia/testing'
 import { vi } from 'vitest'
 
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 708f0be..ab0d86a 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import TaskList from '@/use-cases/task/components/TaskList.vue'
-import { useTaskStore } from '@/use-cases/task/stores/useTask.store'
+import TaskList from '@/modules/task/components/TaskList.vue'
+import { useTaskStore } from '@/modules/task/stores/useTask.store'
 
 const taskStore = useTaskStore()
 </script>
diff --git a/src/views/task/NewTask.vue b/src/views/task/NewTask.vue
index d2df8ac..92f99f3 100644
--- a/src/views/task/NewTask.vue
+++ b/src/views/task/NewTask.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import NewTaskForm from '@/use-cases/task/components/NewTaskForm.vue'
+import NewTaskForm from '@/modules/task/components/NewTaskForm.vue'
 </script>
 
 <template>
diff --git a/src/views/task/TaskView.vue b/src/views/task/TaskView.vue
index 22887b9..4ff2a97 100644
--- a/src/views/task/TaskView.vue
+++ b/src/views/task/TaskView.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useTaskStore } from '@/use-cases/task/stores/useTask.store'
+import { useTaskStore } from '@/modules/task/stores/useTask.store'
 import { computed } from 'vue'
 
 const props = defineProps<{