diff --git a/src/app/contacts/ContactForm/ports.ts b/src/app/contacts/ContactForm/ports.ts
index 66a494f..359f34d 100644
--- a/src/app/contacts/ContactForm/ports.ts
+++ b/src/app/contacts/ContactForm/ports.ts
@@ -1,5 +1,5 @@
-import type { BaseCreateApiPort } from "@/app/common/ports";
 import type { Contact } from "@/domain/entities/contact";
+import type { BaseCreateApiPort } from "@/shared/lib/ports";
 
 export interface ContactFormApiCreateProps {
   email: string;
diff --git a/src/app/contacts/ContactsTable/AudienceContactsTable.vue b/src/app/contacts/ContactsTable/AudienceContactsTable.vue
index b02c7a9..5f572cc 100644
--- a/src/app/contacts/ContactsTable/AudienceContactsTable.vue
+++ b/src/app/contacts/ContactsTable/AudienceContactsTable.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, watch } from "vue";
-import { formatDate } from "@/utils";
+import { formatDate } from "@/shared/lib/utils/date";
 import { useContactsTableStore } from "./store";
 
 const columns = computed(() => [
diff --git a/src/app/contacts/ContactsTable/ports.ts b/src/app/contacts/ContactsTable/ports.ts
index 622dcea..3cf91fe 100644
--- a/src/app/contacts/ContactsTable/ports.ts
+++ b/src/app/contacts/ContactsTable/ports.ts
@@ -1,6 +1,6 @@
-import type { BaseFetchManyApiPort } from "@/app/common/ports";
-import type { EntityId } from "@/domain/common/entity";
 import type { Contact } from "@/domain/entities/contact";
+import type { EntityId } from "@/shared/lib/entity";
+import type { BaseFetchManyApiPort } from "@/shared/lib/ports";
 
 export interface ContactsTableApiFetchManyProps {
   listId?: EntityId;
diff --git a/src/app/files/FilesTable/FilesTable.vue b/src/app/files/FilesTable/FilesTable.vue
index 0162ac3..ab6bffc 100644
--- a/src/app/files/FilesTable/FilesTable.vue
+++ b/src/app/files/FilesTable/FilesTable.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed } from "vue";
 import { useFilesTableStore } from "./store";
-import { formatDate } from "@/utils";
+import { formatDate } from "@/shared/lib/utils/date";
 
 const filesStore = useFilesTableStore();
 
diff --git a/src/app/files/FilesTable/ports.ts b/src/app/files/FilesTable/ports.ts
index 4b50f6c..358547b 100644
--- a/src/app/files/FilesTable/ports.ts
+++ b/src/app/files/FilesTable/ports.ts
@@ -1,4 +1,4 @@
-import type { BaseFetchManyApiPort } from "@/app/common/ports";
 import type { AppFile } from "@/domain/entities/file";
+import type { BaseFetchManyApiPort } from "@/shared/lib/ports";
 
 export type FilesTableApiPort = BaseFetchManyApiPort<AppFile>;
diff --git a/src/app/lists/ListForm/ports.ts b/src/app/lists/ListForm/ports.ts
index 296073c..6ea63c8 100644
--- a/src/app/lists/ListForm/ports.ts
+++ b/src/app/lists/ListForm/ports.ts
@@ -1,5 +1,5 @@
-import type { BaseCreateApiPort } from "@/app/common/ports";
 import type { List } from "@/domain/entities/list";
+import type { BaseCreateApiPort } from "@/shared/lib/ports";
 
 export interface ListFormApiCreateProps {
   displayName: string;
diff --git a/src/app/lists/ListsSelect/ports.ts b/src/app/lists/ListsSelect/ports.ts
index 0e6d4cb..8234b35 100644
--- a/src/app/lists/ListsSelect/ports.ts
+++ b/src/app/lists/ListsSelect/ports.ts
@@ -1,4 +1,4 @@
-import type { BaseFetchManyApiPort } from "@/app/common/ports";
 import type { List } from "@/domain/entities/list";
+import type { BaseFetchManyApiPort } from "@/shared/lib/ports";
 
 export type ListsSelectApiPort = BaseFetchManyApiPort<List>;
diff --git a/src/app/lists/ListsTable/ports.ts b/src/app/lists/ListsTable/ports.ts
index 592e68c..0b80661 100644
--- a/src/app/lists/ListsTable/ports.ts
+++ b/src/app/lists/ListsTable/ports.ts
@@ -1,4 +1,4 @@
-import type { BaseFetchManyApiPort } from "@/app/common/ports";
 import type { List } from "@/domain/entities/list";
+import type { BaseFetchManyApiPort } from "@/shared/lib/ports";
 
 export type ListsTableApiPort = BaseFetchManyApiPort<List>;
diff --git a/src/domain/entities/contact.ts b/src/domain/entities/contact.ts
index 93f192d..71430c7 100644
--- a/src/domain/entities/contact.ts
+++ b/src/domain/entities/contact.ts
@@ -1,4 +1,4 @@
-import type { Entity } from "../common/entity";
+import type { Entity } from "@/shared/lib/entity";
 
 export interface Contact extends Entity {
   email: string;
diff --git a/src/domain/entities/file.ts b/src/domain/entities/file.ts
index bc17bf8..7d96388 100644
--- a/src/domain/entities/file.ts
+++ b/src/domain/entities/file.ts
@@ -1,4 +1,4 @@
-import type { Entity } from "../common/entity";
+import type { Entity } from "@/shared/lib/entity";
 
 export interface AppFile extends Entity {
   name: string;
diff --git a/src/domain/entities/list.ts b/src/domain/entities/list.ts
index 12ea3e8..76d07d0 100644
--- a/src/domain/entities/list.ts
+++ b/src/domain/entities/list.ts
@@ -1,4 +1,4 @@
-import type { Entity } from "../common/entity";
+import type { Entity } from "@/shared/lib/entity";
 
 export interface List extends Entity {
   displayName: string;
diff --git a/src/infra/api/contact.ts b/src/infra/api/contact.ts
index d005d7a..1740cde 100644
--- a/src/infra/api/contact.ts
+++ b/src/infra/api/contact.ts
@@ -5,7 +5,7 @@ import type {
 } from "@/app/contacts";
 import type { EntityId } from "@/domain/common/entity";
 import type { Contact } from "@/domain/entities/contact";
-import { delay } from "@/utils";
+import { delay } from "@/shared/lib/utils/promise";
 import { faker } from "@faker-js/faker";
 
 let $instance: MockContactApi | undefined;
diff --git a/src/infra/api/file.ts b/src/infra/api/file.ts
index d84a056..9faf1f6 100644
--- a/src/infra/api/file.ts
+++ b/src/infra/api/file.ts
@@ -1,6 +1,6 @@
 import type { FileApiPort } from "@/app/files";
 import type { AppFile } from "@/domain/entities/file";
-import { delay } from "@/utils";
+import { delay } from "@/shared/lib/utils/promise";
 import { faker } from "@faker-js/faker";
 
 let $instance: FileApiPort | undefined;
diff --git a/src/infra/api/list.ts b/src/infra/api/list.ts
index 36fa89b..872162e 100644
--- a/src/infra/api/list.ts
+++ b/src/infra/api/list.ts
@@ -1,6 +1,6 @@
 import type { ListApiPort, ListFormApiCreateProps } from "@/app/lists";
 import type { List } from "@/domain/entities/list";
-import { delay } from "@/utils";
+import { delay } from "@/shared/lib/utils/promise";
 import { faker } from "@faker-js/faker";
 
 let $instance: ListApiPort | undefined;
diff --git a/src/infra/api/template.ts b/src/infra/api/template.ts
index cc7360a..3ca019a 100644
--- a/src/infra/api/template.ts
+++ b/src/infra/api/template.ts
@@ -1,7 +1,4 @@
-import type { TemplateApiPort } from "@/app_core/ports/template";
-import { delay } from "@/utils";
 import { faker } from "@faker-js/faker";
-import type { Template } from "../domain/template";
 
 export class MockTemplateApi implements TemplateApiPort {
   #templates: Template[];
diff --git a/src/domain/common/entity.ts b/src/shared/lib/entity.ts
similarity index 100%
rename from src/domain/common/entity.ts
rename to src/shared/lib/entity.ts
diff --git a/src/app/common/ports.ts b/src/shared/lib/ports.ts
similarity index 79%
rename from src/app/common/ports.ts
rename to src/shared/lib/ports.ts
index 6741fd7..7d21f61 100644
--- a/src/app/common/ports.ts
+++ b/src/shared/lib/ports.ts
@@ -1,4 +1,4 @@
-import type { Entity } from "@/domain/common/entity";
+import type { Entity } from "./entity";
 
 export interface BaseFetchManyApiPort<E extends Entity, P = unknown> {
   fetchMany(props: P): Promise<E[]>;
diff --git a/src/shared/lib/utils/date.ts b/src/shared/lib/utils/date.ts
new file mode 100644
index 0000000..1e78a29
--- /dev/null
+++ b/src/shared/lib/utils/date.ts
@@ -0,0 +1,7 @@
+export function formatDate(date: Date): string {
+  return date.toLocaleDateString(undefined, {
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+  });
+}
diff --git a/src/utils.ts b/src/shared/lib/utils/promise.ts
similarity index 53%
rename from src/utils.ts
rename to src/shared/lib/utils/promise.ts
index 3a4e444..e40b033 100644
--- a/src/utils.ts
+++ b/src/shared/lib/utils/promise.ts
@@ -1,11 +1,3 @@
-export function formatDate(date: Date): string {
-  return date.toLocaleDateString(undefined, {
-    year: "numeric",
-    month: "2-digit",
-    day: "2-digit",
-  });
-}
-
 // This util is very useful for mocks to emulate http delay
 export async function delay(timeout: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, timeout));