diff --git a/e2e/global.setup.ts b/e2e/global.setup.ts
index 343921f..b85a632 100644
--- a/e2e/global.setup.ts
+++ b/e2e/global.setup.ts
@@ -2,8 +2,8 @@ import { test as setup } from '@playwright/test'
 import fs from 'fs'
 
 import { ADMIN_AUTH_FILE, USER_AUTH_FILE } from './tests/constants'
-import LoginPage from './tests/pages/login.page'
-import SettingsPage from './tests/pages/settings.page'
+import { LoginPage } from './tests/pages/login.page'
+import { SettingsPage } from './tests/pages/settings.page'
 
 setup('authenticate as user', async ({ page, request }) => {
   if (fs.existsSync(USER_AUTH_FILE)) {
diff --git a/e2e/tests/fixtures.ts b/e2e/tests/fixtures.ts
index a14a17c..dc8f109 100644
--- a/e2e/tests/fixtures.ts
+++ b/e2e/tests/fixtures.ts
@@ -1,8 +1,8 @@
 import { test as base } from '@playwright/test'
 
-import BookPage from './pages/book.page'
-import CatalogPage from './pages/catalog.page'
-import SettingsPage from './pages/settings.page'
+import { BookPage } from './pages/book.page'
+import { CatalogPage } from './pages/catalog.page'
+import { SettingsPage } from './pages/settings.page'
 
 export * from '@playwright/test'
 
diff --git a/e2e/tests/helpers/prisma.ts b/e2e/tests/helpers/prisma.ts
deleted file mode 100644
index 4590932..0000000
--- a/e2e/tests/helpers/prisma.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { PrismaClient } from '@prisma/client'
-
-const prisma = new PrismaClient()
-
-export default prisma
diff --git a/e2e/tests/helpers/ulid.ts b/e2e/tests/helpers/ulid.ts
deleted file mode 100644
index 52196e4..0000000
--- a/e2e/tests/helpers/ulid.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { ulid as base } from 'ulid'
-
-export function ulid(index: number) {
-  return base().slice(0, 14) + suffix(index)
-}
-
-export function suffix(index: number) {
-  return 'WORKER' + String(index).padStart(4, '0')
-}
-
-export default ulid
diff --git a/e2e/tests/pages/book.page.ts b/e2e/tests/pages/book.page.ts
index 6739aa0..b351c3d 100644
--- a/e2e/tests/pages/book.page.ts
+++ b/e2e/tests/pages/book.page.ts
@@ -1,9 +1,9 @@
 import { Page } from '@playwright/test'
 import { ulid } from 'ulid'
 
-import prisma from '../helpers/prisma'
+import { prisma } from '@/lib/prisma/prisma'
 
-class BookPage {
+export class BookPage {
   constructor(private readonly page: Page) {}
 
   async goto(id?: string) {
@@ -63,5 +63,3 @@ class BookPage {
     await prisma.book.deleteMany({ where: { id: { in: ids } } })
   }
 }
-
-export default BookPage
diff --git a/e2e/tests/pages/catalog.page.ts b/e2e/tests/pages/catalog.page.ts
index 7ecd50f..a76717e 100644
--- a/e2e/tests/pages/catalog.page.ts
+++ b/e2e/tests/pages/catalog.page.ts
@@ -1,6 +1,6 @@
 import { Page } from '@playwright/test'
 
-class CatalogPage {
+export class CatalogPage {
   constructor(private readonly page: Page) {}
 
   async goto() {
@@ -27,5 +27,3 @@ class CatalogPage {
       .waitFor({ state: 'visible' })
   }
 }
-
-export default CatalogPage
diff --git a/e2e/tests/pages/login.page.ts b/e2e/tests/pages/login.page.ts
index e498ee6..2a3a4e0 100644
--- a/e2e/tests/pages/login.page.ts
+++ b/e2e/tests/pages/login.page.ts
@@ -1,6 +1,6 @@
 import { Page } from '@playwright/test'
 
-class LoginPage {
+export class LoginPage {
   constructor(private readonly page: Page) {}
 
   async goto() {
@@ -28,5 +28,3 @@ class LoginPage {
     return webMailPage
   }
 }
-
-export default LoginPage
diff --git a/e2e/tests/pages/settings.page.ts b/e2e/tests/pages/settings.page.ts
index 84cc8cb..6333b28 100644
--- a/e2e/tests/pages/settings.page.ts
+++ b/e2e/tests/pages/settings.page.ts
@@ -1,10 +1,9 @@
 import { Page } from '@playwright/test'
 
-import gravatar from '@/lib/utils/gravatar'
+import { prisma } from '@/lib/prisma/prisma'
+import { gravatar } from '@/lib/utils/gravatar'
 
-import prisma from '../helpers/prisma'
-
-class SettingsPage {
+export class SettingsPage {
   constructor(private readonly page: Page) {}
 
   async goto() {
@@ -47,5 +46,3 @@ class SettingsPage {
     })
   }
 }
-
-export default SettingsPage
diff --git a/package.json b/package.json
index eb5b9ab..29f4cf2 100644
--- a/package.json
+++ b/package.json
@@ -160,6 +160,7 @@
       "eqeqeq": "error",
       "import/first": "error",
       "import/newline-after-import": "error",
+      "import/no-default-export": "error",
       "import/no-duplicates": "error",
       "no-shadow": "off",
       "simple-import-sort/exports": "error",
@@ -171,6 +172,20 @@
       "unicorn/no-useless-undefined": "off",
       "unicorn/prefer-node-protocol": "off",
       "unused-imports/no-unused-imports": "error"
-    }
+    },
+    "overrides": [
+      {
+        "files": [
+          "./src/app/**/*.{tsx,ts,js,jsx}",
+          "./stories/**/*.{tsx,ts,js,jsx}"
+        ],
+        "excludedFiles": [
+          "./src/app/**/{actions,components}/*.{tsx,ts,js,jsx}"
+        ],
+        "rules": {
+          "import/no-default-export": "off"
+        }
+      }
+    ]
   }
 }
diff --git a/src/app/(auth)/signin/_components/sign-in-email-form/actions.ts b/src/app/(auth)/actions/sign-in-action.ts
similarity index 92%
rename from src/app/(auth)/signin/_components/sign-in-email-form/actions.ts
rename to src/app/(auth)/actions/sign-in-action.ts
index e96c22e..9ad07d4 100644
--- a/src/app/(auth)/signin/_components/sign-in-email-form/actions.ts
+++ b/src/app/(auth)/actions/sign-in-action.ts
@@ -3,7 +3,7 @@
 import { z } from 'zod'
 
 import { signIn } from '@/lib/auth/auth'
-import FormResponse from '@/lib/zod/form-response'
+import { FormResponse } from '@/lib/zod/form-response'
 
 export interface SignInForm {
   email?: string
diff --git a/src/app/(auth)/signout/_components/sign-out-form/actions.ts b/src/app/(auth)/actions/sign-out-action.ts
similarity index 100%
rename from src/app/(auth)/signout/_components/sign-out-form/actions.ts
rename to src/app/(auth)/actions/sign-out-action.ts
diff --git a/src/app/(auth)/_components/auth-card/auth-card-footer.tsx b/src/app/(auth)/components/auth-card-footer.tsx
similarity index 83%
rename from src/app/(auth)/_components/auth-card/auth-card-footer.tsx
rename to src/app/(auth)/components/auth-card-footer.tsx
index 217fb39..e8e1d67 100644
--- a/src/app/(auth)/_components/auth-card/auth-card-footer.tsx
+++ b/src/app/(auth)/components/auth-card-footer.tsx
@@ -9,7 +9,7 @@ function useController(properties: AuthModalFooterProperties) {
   return { ...properties }
 }
 
-export default function AuthCardFooter(properties: AuthModalFooterProperties) {
+export function AuthCardFooter(properties: AuthModalFooterProperties) {
   const { children } = useController(properties)
   return (
     <CardFooter>
diff --git a/src/app/(auth)/_components/auth-card/auth-card-header.tsx b/src/app/(auth)/components/auth-card-header.tsx
similarity index 87%
rename from src/app/(auth)/_components/auth-card/auth-card-header.tsx
rename to src/app/(auth)/components/auth-card-header.tsx
index 4d011b7..1eae483 100644
--- a/src/app/(auth)/_components/auth-card/auth-card-header.tsx
+++ b/src/app/(auth)/components/auth-card-header.tsx
@@ -6,7 +6,7 @@ interface AuthModalHeaderProperties {
   title: string
 }
 
-export default function AuthCardHeader(properties: AuthModalHeaderProperties) {
+export function AuthCardHeader(properties: AuthModalHeaderProperties) {
   const { children, title } = { ...properties }
   return (
     <CardBody className="flex-col gap-4">
diff --git a/src/app/(auth)/_components/auth-card/auth-card.tsx b/src/app/(auth)/components/auth-card.tsx
similarity index 84%
rename from src/app/(auth)/_components/auth-card/auth-card.tsx
rename to src/app/(auth)/components/auth-card.tsx
index 357b880..a708e42 100644
--- a/src/app/(auth)/_components/auth-card/auth-card.tsx
+++ b/src/app/(auth)/components/auth-card.tsx
@@ -1,13 +1,13 @@
 import { Card, CardHeader } from '@nextui-org/react'
 import React, { ReactNode } from 'react'
 
-import ThemeImage from '@/components/theme-image/theme-image'
+import { ThemeImage } from '@/components/image/theme-image'
 
 interface AuthModalProperties {
   children: ReactNode
 }
 
-export default function AuthCard(properties: AuthModalProperties) {
+export function AuthCard(properties: AuthModalProperties) {
   const { children } = { ...properties }
   return (
     <>
diff --git a/src/app/(auth)/signin/_components/sign-in-email-form/sign-in-email-form.tsx b/src/app/(auth)/components/sign-in-email-form.tsx
similarity index 82%
rename from src/app/(auth)/signin/_components/sign-in-email-form/sign-in-email-form.tsx
rename to src/app/(auth)/components/sign-in-email-form.tsx
index b85754d..49f9e42 100644
--- a/src/app/(auth)/signin/_components/sign-in-email-form/sign-in-email-form.tsx
+++ b/src/app/(auth)/components/sign-in-email-form.tsx
@@ -5,11 +5,11 @@ import { Button } from '@nextui-org/react'
 import React from 'react'
 import { useFormState } from 'react-dom'
 
-import { signInAction } from '@/app/(auth)/signin/_components/sign-in-email-form/actions'
-import InputForm from '@/components/input-form/input-form'
-import FormResponse from '@/lib/zod/form-response'
+import { signInAction } from '@/app/(auth)/actions/sign-in-action'
+import { InputForm } from '@/components/form/input-form'
+import { FormResponse } from '@/lib/zod/form-response'
 
-export default function SignInEmailForm() {
+export function SignInEmailForm() {
   const [state, action] = useFormState(
     signInAction,
     FormResponse.initialState({
diff --git a/src/app/(auth)/signout/_components/sign-out-form/sign-out-form.tsx b/src/app/(auth)/components/sign-out-form.tsx
similarity index 80%
rename from src/app/(auth)/signout/_components/sign-out-form/sign-out-form.tsx
rename to src/app/(auth)/components/sign-out-form.tsx
index 6b60f9b..114e2d1 100644
--- a/src/app/(auth)/signout/_components/sign-out-form/sign-out-form.tsx
+++ b/src/app/(auth)/components/sign-out-form.tsx
@@ -4,9 +4,9 @@ import { ArrowRightStartOnRectangleIcon } from '@heroicons/react/24/outline'
 import { Button } from '@nextui-org/react'
 import React from 'react'
 
-import { signOutAction } from '@/app/(auth)/signout/_components/sign-out-form/actions'
+import { signOutAction } from '@/app/(auth)/actions/sign-out-action'
 
-export default function SignOutForm() {
+export function SignOutForm() {
   return (
     <form className="flex flex-col gap-2" action={signOutAction}>
       <Button
diff --git a/src/app/(auth)/signin/page.tsx b/src/app/(auth)/signin/page.tsx
index d9752d5..605e5a5 100644
--- a/src/app/(auth)/signin/page.tsx
+++ b/src/app/(auth)/signin/page.tsx
@@ -3,10 +3,10 @@ import { Metadata } from 'next'
 import { redirect } from 'next/navigation'
 import React from 'react'
 
-import AuthCard from '@/app/(auth)/_components/auth-card/auth-card'
-import AuthCardFooter from '@/app/(auth)/_components/auth-card/auth-card-footer'
-import AuthCardHeader from '@/app/(auth)/_components/auth-card/auth-card-header'
-import SignInEmailForm from '@/app/(auth)/signin/_components/sign-in-email-form/sign-in-email-form'
+import { AuthCard } from '@/app/(auth)/components/auth-card'
+import { AuthCardFooter } from '@/app/(auth)/components/auth-card-footer'
+import { AuthCardHeader } from '@/app/(auth)/components/auth-card-header'
+import { SignInEmailForm } from '@/app/(auth)/components/sign-in-email-form'
 import { auth } from '@/lib/auth/auth'
 
 export const metadata: Metadata = {
diff --git a/src/app/(auth)/signout/page.tsx b/src/app/(auth)/signout/page.tsx
index 82c579c..84a1778 100644
--- a/src/app/(auth)/signout/page.tsx
+++ b/src/app/(auth)/signout/page.tsx
@@ -2,9 +2,9 @@ import { Metadata } from 'next'
 import { redirect } from 'next/navigation'
 import React from 'react'
 
-import AuthCard from '@/app/(auth)/_components/auth-card/auth-card'
-import AuthCardHeader from '@/app/(auth)/_components/auth-card/auth-card-header'
-import SignOutForm from '@/app/(auth)/signout/_components/sign-out-form/sign-out-form'
+import { AuthCard } from '@/app/(auth)/components/auth-card'
+import { AuthCardHeader } from '@/app/(auth)/components/auth-card-header'
+import { SignOutForm } from '@/app/(auth)/components/sign-out-form'
 import { auth } from '@/lib/auth/auth'
 
 export const metadata: Metadata = {
diff --git a/src/app/(auth)/verify/page.tsx b/src/app/(auth)/verify/page.tsx
index ce055f1..7553079 100644
--- a/src/app/(auth)/verify/page.tsx
+++ b/src/app/(auth)/verify/page.tsx
@@ -4,9 +4,9 @@ import Link from 'next/link'
 import { redirect } from 'next/navigation'
 import React from 'react'
 
-import AuthCard from '@/app/(auth)/_components/auth-card/auth-card'
-import AuthCardFooter from '@/app/(auth)/_components/auth-card/auth-card-footer'
-import AuthCardHeader from '@/app/(auth)/_components/auth-card/auth-card-header'
+import { AuthCard } from '@/app/(auth)/components/auth-card'
+import { AuthCardFooter } from '@/app/(auth)/components/auth-card-footer'
+import { AuthCardHeader } from '@/app/(auth)/components/auth-card-header'
 import { auth } from '@/lib/auth/auth'
 
 export const metadata: Metadata = {
diff --git a/src/app/@modal/(.)search/_components/search-modal/hooks.ts b/src/app/@modal/(.)search/_components/search-modal/hooks.ts
deleted file mode 100644
index 2977c7d..0000000
--- a/src/app/@modal/(.)search/_components/search-modal/hooks.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { useDisclosure } from '@nextui-org/react'
-import {
-  usePathname,
-  useSearchParams,
-} from 'next/dist/client/components/navigation'
-import { useRouter } from 'next/navigation'
-import { useDebouncedCallback } from 'use-debounce'
-
-import BookResponse from '@/core/book/dto/responses/book.response'
-
-export function useController() {
-  const { onOpen, onOpenChange } = useDisclosure()
-  const router = useRouter()
-  const pathname = usePathname()
-  const searchParameters = useSearchParams()
-
-  const handleSearch = useDebouncedCallback((term: string) => {
-    const parameters = new URLSearchParams(searchParameters)
-
-    if (term) {
-      parameters.set('query', term)
-    } else {
-      parameters.delete('query')
-    }
-
-    router.replace(`${pathname}?${parameters.toString()}`)
-  }, 200)
-
-  const onClose = () => {
-    router.back()
-  }
-
-  const onSelectedBook = (book: BookResponse) => {
-    router.back()
-    setTimeout(() => router.push(`/books/${book.id}`), 100)
-  }
-
-  return {
-    handleSearch,
-    modal: { onClose, onOpen, onOpenChange, onSelectedBook },
-    query: searchParameters.get('query')?.toString(),
-  }
-}
diff --git a/src/app/@modal/(.)search/_components/search-modal/search-modal.tsx b/src/app/@modal/(.)search/_components/search-modal/search-modal.tsx
deleted file mode 100644
index a2c9974..0000000
--- a/src/app/@modal/(.)search/_components/search-modal/search-modal.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-'use client'
-
-import { Input } from '@nextui-org/input'
-import { Modal, ModalBody, ModalContent } from '@nextui-org/modal'
-import { Kbd } from '@nextui-org/react'
-import { SearchIcon } from '@nextui-org/shared-icons'
-import { Suspense } from 'react'
-
-import { useController } from '@/app/@modal/(.)search/_components/search-modal/hooks'
-import SearchResult from '@/app/@modal/(.)search/_components/search-result/search-result'
-
-export default function SearchModal() {
-  const {
-    handleSearch,
-    modal: { onClose, onOpenChange, onSelectedBook },
-    query,
-  } = useController()
-
-  return (
-    <div>
-      <Modal
-        isOpen={true}
-        onOpenChange={onOpenChange}
-        placement="top"
-        hideCloseButton
-        size="3xl"
-        onClose={onClose}
-      >
-        <ModalContent>
-          {() => (
-            <>
-              <ModalBody className="w-full p-0">
-                <Input
-                  autoFocus
-                  startContent={<SearchIcon />}
-                  endContent={<Kbd keys={'escape'}></Kbd>}
-                  placeholder="Buscar actividad"
-                  defaultValue={query}
-                  onValueChange={handleSearch}
-                />
-                <Suspense fallback={<>Loading...</>}>
-                  <SearchResult query={query} onSelectedBook={onSelectedBook} />
-                </Suspense>
-              </ModalBody>
-            </>
-          )}
-        </ModalContent>
-      </Modal>
-    </div>
-  )
-}
diff --git a/src/app/@modal/(.)search/_components/search-modal/types.ts b/src/app/@modal/(.)search/_components/search-modal/types.ts
deleted file mode 100644
index 93f1db1..0000000
--- a/src/app/@modal/(.)search/_components/search-modal/types.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export default interface SearchModalProperties {
-  defaultOpen: boolean
-}
diff --git a/src/app/@modal/(.)search/_components/search-result/hooks.ts b/src/app/@modal/(.)search/_components/search-result/hooks.ts
deleted file mode 100644
index 0d584be..0000000
--- a/src/app/@modal/(.)search/_components/search-result/hooks.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { useEffect, useState } from 'react'
-
-import { SearchResultProperties } from '@/app/@modal/(.)search/_components/search-result/types'
-import BookResponse from '@/core/book/dto/responses/book.response'
-import { searchBooks } from '@/core/book/infrastructure/actions/search-books'
-
-export function useController(properties: SearchResultProperties) {
-  const { query = '' } = properties
-
-  const [searchResult, setSearchResult] = useState<BookResponse[] | undefined>()
-
-  useEffect(() => {
-    const controller = new AbortController()
-
-    searchBooks({ terms: query.split(' ') })
-      .then((result) => setSearchResult(result))
-      .catch(() => {})
-
-    return () => {
-      controller.abort()
-    }
-  }, [query])
-
-  return { searchResult, ...properties }
-}
diff --git a/src/app/@modal/(.)search/_components/search-result/search-result.tsx b/src/app/@modal/(.)search/_components/search-result/search-result.tsx
deleted file mode 100644
index 3729c6b..0000000
--- a/src/app/@modal/(.)search/_components/search-result/search-result.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-'use client'
-
-import { Listbox, ListboxItem } from '@nextui-org/react'
-import { AddNoteBulkIcon } from '@nextui-org/shared-icons'
-
-import { useController } from '@/app/@modal/(.)search/_components/search-result/hooks'
-import { SearchResultProperties } from '@/app/@modal/(.)search/_components/search-result/types'
-
-export default function SearchResult(properties: SearchResultProperties) {
-  const { onSelectedBook, searchResult } = useController(properties)
-
-  if (!searchResult || searchResult.length === 0) {
-    return null
-  }
-
-  return (
-    <div>
-      <Listbox aria-label="Found books" items={searchResult}>
-        {(book) => (
-          <ListboxItem
-            description={book.authors.join(', ')}
-            key={book.id}
-            startContent={<AddNoteBulkIcon />}
-            onClick={() => onSelectedBook(book)}
-          >
-            {book.title.slice(0, 100)}
-          </ListboxItem>
-        )}
-      </Listbox>
-    </div>
-  )
-}
diff --git a/src/app/@modal/(.)search/_components/search-result/types.ts b/src/app/@modal/(.)search/_components/search-result/types.ts
deleted file mode 100644
index 2a289e2..0000000
--- a/src/app/@modal/(.)search/_components/search-result/types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import BookResponse from '@/core/book/dto/responses/book.response'
-
-export interface SearchResultProperties {
-  onSelectedBook: (book: BookResponse) => void
-  query?: string
-}
diff --git a/src/app/@modal/(.)search/components/search-modal.tsx b/src/app/@modal/(.)search/components/search-modal.tsx
new file mode 100644
index 0000000..fdc795d
--- /dev/null
+++ b/src/app/@modal/(.)search/components/search-modal.tsx
@@ -0,0 +1,91 @@
+'use client'
+
+import { Input } from '@nextui-org/input'
+import { Modal, ModalBody, ModalContent } from '@nextui-org/modal'
+import { Kbd, useDisclosure } from '@nextui-org/react'
+import { SearchIcon } from '@nextui-org/shared-icons'
+import {
+  usePathname,
+  useSearchParams,
+} from 'next/dist/client/components/navigation'
+import { useRouter } from 'next/navigation'
+import { Suspense } from 'react'
+import { useDebouncedCallback } from 'use-debounce'
+
+import { SearchResult } from '@/app/@modal/(.)search/components/search-result'
+import { BookResponse } from '@/core/book/dto/responses/book.response'
+
+export function useController() {
+  const { onOpen, onOpenChange } = useDisclosure()
+  const router = useRouter()
+  const pathname = usePathname()
+  const searchParameters = useSearchParams()
+
+  const handleSearch = useDebouncedCallback((term: string) => {
+    const parameters = new URLSearchParams(searchParameters)
+
+    if (term) {
+      parameters.set('query', term)
+    } else {
+      parameters.delete('query')
+    }
+
+    router.replace(`${pathname}?${parameters.toString()}`)
+  }, 200)
+
+  const onClose = () => {
+    router.back()
+  }
+
+  const onSelectedBook = (book: BookResponse) => {
+    router.back()
+    setTimeout(() => router.push(`/books/${book.id}`), 100)
+  }
+
+  return {
+    handleSearch,
+    modal: { onClose, onOpen, onOpenChange, onSelectedBook },
+    query: searchParameters.get('query')?.toString(),
+  }
+}
+
+export function SearchModal() {
+  const {
+    handleSearch,
+    modal: { onClose, onOpenChange, onSelectedBook },
+    query,
+  } = useController()
+
+  return (
+    <div>
+      <Modal
+        isOpen={true}
+        onOpenChange={onOpenChange}
+        placement="top"
+        hideCloseButton
+        size="3xl"
+        onClose={onClose}
+      >
+        <ModalContent>
+          {() => (
+            <>
+              <ModalBody className="w-full p-0">
+                <Input
+                  autoFocus
+                  startContent={<SearchIcon />}
+                  endContent={<Kbd keys={'escape'}></Kbd>}
+                  placeholder="Buscar actividad"
+                  defaultValue={query}
+                  onValueChange={handleSearch}
+                />
+                <Suspense fallback={<>Loading...</>}>
+                  <SearchResult query={query} onSelectedBook={onSelectedBook} />
+                </Suspense>
+              </ModalBody>
+            </>
+          )}
+        </ModalContent>
+      </Modal>
+    </div>
+  )
+}
diff --git a/src/app/@modal/(.)search/components/search-result.tsx b/src/app/@modal/(.)search/components/search-result.tsx
new file mode 100644
index 0000000..affe2c5
--- /dev/null
+++ b/src/app/@modal/(.)search/components/search-result.tsx
@@ -0,0 +1,58 @@
+'use client'
+
+import { Listbox, ListboxItem } from '@nextui-org/react'
+import { AddNoteBulkIcon } from '@nextui-org/shared-icons'
+import { useEffect, useState } from 'react'
+
+import { BookResponse } from '@/core/book/dto/responses/book.response'
+import { searchBooks } from '@/core/book/infrastructure/actions/search-books'
+
+export interface SearchResultProperties {
+  onSelectedBook: (book: BookResponse) => void
+  query?: string
+}
+
+export function useController(properties: SearchResultProperties) {
+  const { query = '' } = properties
+
+  const [searchResult, setSearchResult] = useState<BookResponse[] | undefined>()
+
+  useEffect(() => {
+    const controller = new AbortController()
+
+    searchBooks({ terms: query.split(' ') })
+      .then((result) => setSearchResult(result))
+      .catch(() => {})
+
+    return () => {
+      controller.abort()
+    }
+  }, [query])
+
+  return { searchResult, ...properties }
+}
+
+export function SearchResult(properties: SearchResultProperties) {
+  const { onSelectedBook, searchResult } = useController(properties)
+
+  if (!searchResult || searchResult.length === 0) {
+    return null
+  }
+
+  return (
+    <div>
+      <Listbox aria-label="Found books" items={searchResult}>
+        {(book) => (
+          <ListboxItem
+            description={book.authors.join(', ')}
+            key={book.id}
+            startContent={<AddNoteBulkIcon />}
+            onClick={() => onSelectedBook(book)}
+          >
+            {book.title.slice(0, 100)}
+          </ListboxItem>
+        )}
+      </Listbox>
+    </div>
+  )
+}
diff --git a/src/app/@modal/(.)search/page.tsx b/src/app/@modal/(.)search/page.tsx
index e4b1576..ad592cd 100644
--- a/src/app/@modal/(.)search/page.tsx
+++ b/src/app/@modal/(.)search/page.tsx
@@ -1,6 +1,6 @@
 'use client'
 
-import SearchModal from '@/app/@modal/(.)search/_components/search-modal/search-modal'
+import { SearchModal } from '@/app/@modal/(.)search/components/search-modal'
 
 export default function Page() {
   return <SearchModal />
diff --git a/src/app/admin/users/_components/users-table/users-table-cell-action.tsx b/src/app/admin/users/components/users-table-cell-action.tsx
similarity index 79%
rename from src/app/admin/users/_components/users-table/users-table-cell-action.tsx
rename to src/app/admin/users/components/users-table-cell-action.tsx
index 0b5c906..6e5415b 100644
--- a/src/app/admin/users/_components/users-table/users-table-cell-action.tsx
+++ b/src/app/admin/users/components/users-table-cell-action.tsx
@@ -2,8 +2,8 @@
 
 import { Switch } from '@nextui-org/react'
 
-import UserResponse from '@/core/user/dto/responses/user.response'
-import enableUser from '@/core/user/infrastructure/actions/enable-user'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
+import { enableUser } from '@/core/user/infrastructure/actions/enable-user'
 
 interface UsersTableCellActionProperties {
   user: UserResponse
diff --git a/src/app/admin/users/_components/users-table/users-table-cell.tsx b/src/app/admin/users/components/users-table-cell.tsx
similarity index 74%
rename from src/app/admin/users/_components/users-table/users-table-cell.tsx
rename to src/app/admin/users/components/users-table-cell.tsx
index 3adacba..615cacb 100644
--- a/src/app/admin/users/_components/users-table/users-table-cell.tsx
+++ b/src/app/admin/users/components/users-table-cell.tsx
@@ -3,16 +3,16 @@
 import { User } from '@nextui-org/react'
 import { Key } from 'react'
 
-import { UsersTableCellAction } from '@/app/admin/users/_components/users-table/users-table-cell-action'
-import UserResponse from '@/core/user/dto/responses/user.response'
-import gravatar from '@/lib/utils/gravatar'
+import { UsersTableCellAction } from '@/app/admin/users/components/users-table-cell-action'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
+import { gravatar } from '@/lib/utils/gravatar'
 
 interface UsersTableCellProperties {
   columnKey: Key
   user: UserResponse
 }
 
-export default function UsersTableCell(properties: UsersTableCellProperties) {
+export function UsersTableCell(properties: UsersTableCellProperties) {
   const { columnKey, user } = properties
 
   switch (columnKey) {
diff --git a/src/app/admin/users/_components/users-table/users-table.tsx b/src/app/admin/users/components/users-table.tsx
similarity index 90%
rename from src/app/admin/users/_components/users-table/users-table.tsx
rename to src/app/admin/users/components/users-table.tsx
index bca1dfe..ca6a5d2 100644
--- a/src/app/admin/users/_components/users-table/users-table.tsx
+++ b/src/app/admin/users/components/users-table.tsx
@@ -11,8 +11,8 @@ import {
 import { SortDescriptor } from '@react-types/shared/src/collections'
 import { useCallback, useState } from 'react'
 
-import UsersTableCell from '@/app/admin/users/_components/users-table/users-table-cell'
-import UserResponse from '@/core/user/dto/responses/user.response'
+import { UsersTableCell } from '@/app/admin/users/components/users-table-cell'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
 
 const COLUMNS = [
   { name: 'Email', uid: 'email' },
@@ -24,7 +24,7 @@ interface UsersTableProperties {
   users: UserResponse[]
 }
 
-export default function UsersTable(properties: UsersTableProperties) {
+export function UsersTable(properties: UsersTableProperties) {
   const { sortDescriptor, sortHandle, users } = useController(properties)
 
   return (
diff --git a/src/app/admin/users/page.tsx b/src/app/admin/users/page.tsx
index 819ef34..6b57f97 100644
--- a/src/app/admin/users/page.tsx
+++ b/src/app/admin/users/page.tsx
@@ -1,6 +1,6 @@
 'use server'
 
-import UsersTable from '@/app/admin/users/_components/users-table/users-table'
+import { UsersTable } from '@/app/admin/users/components/users-table'
 import { findUsers } from '@/core/user/infrastructure/actions/find-users'
 
 export default async function Page() {
diff --git a/src/app/books/[id]/edit/page.tsx b/src/app/books/[id]/edit/page.tsx
index e366444..a3ef382 100644
--- a/src/app/books/[id]/edit/page.tsx
+++ b/src/app/books/[id]/edit/page.tsx
@@ -1,7 +1,7 @@
 import { Card, CardBody, CardHeader } from '@nextui-org/react'
 import { notFound } from 'next/navigation'
 
-import BookForm from '@/app/books/_components/book-form/book-form'
+import { BookViewForm } from '@/app/books/components/book-view-form'
 import { findBook } from '@/core/book/infrastructure/actions/find-book'
 
 interface PageParameters {
@@ -22,7 +22,7 @@ export default async function Page({ params }: { params: PageParameters }) {
           <h1 className="text-2xl font-extrabold">Editar libro</h1>
         </CardHeader>
         <CardBody className="col-span-1 lg:col-span-2 xl:col-span-3">
-          <BookForm book={book} />
+          <BookViewForm book={book} />
         </CardBody>
       </Card>
     </main>
diff --git a/src/app/books/[id]/page.tsx b/src/app/books/[id]/page.tsx
index b99f9d2..fe3850e 100644
--- a/src/app/books/[id]/page.tsx
+++ b/src/app/books/[id]/page.tsx
@@ -1,10 +1,10 @@
 import { notFound } from 'next/navigation'
 
-import BookPage from '@/app/books/_components/book-page/book-page'
+import { BookView } from '@/app/books/components/book-view'
 import { findBook } from '@/core/book/infrastructure/actions/find-book'
-import getHistoricalLoans from '@/core/loan/infrastructure/actions/get-historical-loans'
-import UserResponse from '@/core/user/dto/responses/user.response'
-import me from '@/core/user/infrastructure/actions/me'
+import { getHistoricalLoans } from '@/core/loan/infrastructure/actions/get-historical-loans'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
+import { me } from '@/core/user/infrastructure/actions/me'
 
 interface PageParameters {
   id: string
@@ -21,7 +21,7 @@ export default async function Page({ params }: { params: PageParameters }) {
 
   return (
     <>
-      <BookPage user={user} book={book} historicalLoans={historicalLoans} />
+      <BookView user={user} book={book} historicalLoans={historicalLoans} />
     </>
   )
 }
diff --git a/src/app/books/_components/book-card/book-card-action-button.tsx b/src/app/books/components/book-card-action-button.tsx
similarity index 95%
rename from src/app/books/_components/book-card/book-card-action-button.tsx
rename to src/app/books/components/book-card-action-button.tsx
index beb12cc..b7bf571 100644
--- a/src/app/books/_components/book-card/book-card-action-button.tsx
+++ b/src/app/books/components/book-card-action-button.tsx
@@ -1,7 +1,7 @@
 import { BookmarkIcon, BookmarkSlashIcon } from '@heroicons/react/24/solid'
 import { ReactNode } from 'react'
 
-import SubmitButton from '@/components/submit-button/submit-button'
+import { SubmitButton } from '@/components/form/submit-button'
 
 interface BookCardActionButtonProperties {
   'aria-label': string
diff --git a/src/app/books/_components/book-card/book-card-form.tsx b/src/app/books/components/book-card-form.tsx
similarity index 79%
rename from src/app/books/_components/book-card/book-card-form.tsx
rename to src/app/books/components/book-card-form.tsx
index 65b1982..f4a513e 100644
--- a/src/app/books/_components/book-card/book-card-form.tsx
+++ b/src/app/books/components/book-card-form.tsx
@@ -6,12 +6,12 @@ import { useFormState } from 'react-dom'
 import {
   BookCardActionLoanButton,
   BookCardActionReturnButton,
-} from '@/app/books/_components/book-card/book-card-action-button'
-import { showToast } from '@/components/toast/toast'
-import BookResponse from '@/core/book/dto/responses/book.response'
+} from '@/app/books/components/book-card-action-button'
+import { showToast } from '@/components/form/toast'
+import { BookResponse } from '@/core/book/dto/responses/book.response'
 import { loanAction } from '@/core/loan/infrastructure/actions/loan-actions'
-import UserResponse from '@/core/user/dto/responses/user.response'
-import FormResponse from '@/lib/zod/form-response'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
+import { FormResponse } from '@/lib/zod/form-response'
 
 interface BookCardFormProperties {
   book: BookResponse
@@ -34,7 +34,7 @@ function useController(properties: BookCardFormProperties) {
   return { currentAction, isActive, isOwned, ...properties }
 }
 
-export default function BookCardForm(properties: BookCardFormProperties) {
+export function BookCardForm(properties: BookCardFormProperties) {
   const {
     currentAction: [state, action],
     isActive,
diff --git a/src/app/books/_components/book-grid/book-grid.tsx b/src/app/books/components/book-card-grid.tsx
similarity index 59%
rename from src/app/books/_components/book-grid/book-grid.tsx
rename to src/app/books/components/book-card-grid.tsx
index 7c8face..f1ce7a2 100644
--- a/src/app/books/_components/book-grid/book-grid.tsx
+++ b/src/app/books/components/book-card-grid.tsx
@@ -1,13 +1,13 @@
-import BookCard from '@/app/books/_components/book-card/book-card'
-import BookResponse from '@/core/book/dto/responses/book.response'
-import UserResponse from '@/core/user/dto/responses/user.response'
+import { BookCard } from '@/app/books/components/book-card'
+import { BookResponse } from '@/core/book/dto/responses/book.response'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
 
 export interface BookGridProperties {
   books: BookResponse[]
   me?: UserResponse
 }
 
-export default function BookGrid(properties: BookGridProperties) {
+export function BookCardGrid(properties: BookGridProperties) {
   const { books, me } = properties
   return (
     <>
diff --git a/src/app/books/_components/book-card/book-card.tsx b/src/app/books/components/book-card.tsx
similarity index 86%
rename from src/app/books/_components/book-card/book-card.tsx
rename to src/app/books/components/book-card.tsx
index be02ad5..7335051 100644
--- a/src/app/books/_components/book-card/book-card.tsx
+++ b/src/app/books/components/book-card.tsx
@@ -2,9 +2,9 @@ import { Card, CardBody } from '@nextui-org/react'
 import Image from 'next/image'
 import Link from 'next/link'
 
-import BookCardForm from '@/app/books/_components/book-card/book-card-form'
-import BookResponse from '@/core/book/dto/responses/book.response'
-import UserResponse from '@/core/user/dto/responses/user.response'
+import { BookCardForm } from '@/app/books/components/book-card-form'
+import { BookResponse } from '@/core/book/dto/responses/book.response'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
 
 interface BookCardProperties {
   book: BookResponse
@@ -17,7 +17,7 @@ const CardColor = {
   Owned: 'border-t-zinc-600',
 }
 
-export default function BookCard(properties: BookCardProperties) {
+export function BookCard(properties: BookCardProperties) {
   const { book, me } = properties
 
   const isLoaned = !!book.loan
diff --git a/src/app/books/_components/book-breadcrumbs/book-breadcrumbs.tsx b/src/app/books/components/book-view-breadcrumbs.tsx
similarity index 86%
rename from src/app/books/_components/book-breadcrumbs/book-breadcrumbs.tsx
rename to src/app/books/components/book-view-breadcrumbs.tsx
index e680ca4..d4b4263 100644
--- a/src/app/books/_components/book-breadcrumbs/book-breadcrumbs.tsx
+++ b/src/app/books/components/book-view-breadcrumbs.tsx
@@ -7,7 +7,7 @@ interface BookBreadcrumbsProperties {
   title: string
 }
 
-export default function BookBreadcrumbs(properties: BookBreadcrumbsProperties) {
+export function BookViewBreadcrumbs(properties: BookBreadcrumbsProperties) {
   const router = useRouter()
   router.prefetch('/')
 
diff --git a/src/app/books/_components/book-form/book-form.tsx b/src/app/books/components/book-view-form.tsx
similarity index 84%
rename from src/app/books/_components/book-form/book-form.tsx
rename to src/app/books/components/book-view-form.tsx
index ea2be54..7f7de73 100644
--- a/src/app/books/_components/book-form/book-form.tsx
+++ b/src/app/books/components/book-view-form.tsx
@@ -6,13 +6,13 @@ import { useEffect } from 'react'
 import { useFormState } from 'react-dom'
 import { ulid } from 'ulid'
 
-import InputForm from '@/components/input-form/input-form'
-import SubmitButton from '@/components/submit-button/submit-button'
-import { showToast } from '@/components/toast/toast'
-import BookResponse from '@/core/book/dto/responses/book.response'
+import { InputForm } from '@/components/form/input-form'
+import { SubmitButton } from '@/components/form/submit-button'
+import { showToast } from '@/components/form/toast'
+import { BookResponse } from '@/core/book/dto/responses/book.response'
 import { createBook } from '@/core/book/infrastructure/actions/create-book'
 import { editBook } from '@/core/book/infrastructure/actions/edit-book'
-import FormResponse from '@/lib/zod/form-response'
+import { FormResponse } from '@/lib/zod/form-response'
 
 interface BookFormProperties {
   book?: BookResponse
@@ -36,7 +36,7 @@ function useController(properties: BookFormProperties) {
   return { ...properties, formState }
 }
 
-export default function BookForm(properties: BookFormProperties) {
+export function BookViewForm(properties: BookFormProperties) {
   const { formState } = useController(properties)
   const [state, action] = formState
 
diff --git a/src/app/books/_components/book-page/book-page.tsx b/src/app/books/components/book-view.tsx
similarity index 84%
rename from src/app/books/_components/book-page/book-page.tsx
rename to src/app/books/components/book-view.tsx
index 8361bb7..533c0a4 100644
--- a/src/app/books/_components/book-page/book-page.tsx
+++ b/src/app/books/components/book-view.tsx
@@ -13,11 +13,11 @@ import { format } from 'date-fns'
 import { es } from 'date-fns/locale'
 import Link from 'next/link'
 
-import BookBreadcrumbs from '@/app/books/_components/book-breadcrumbs/book-breadcrumbs'
-import BookCard from '@/app/books/_components/book-card/book-card'
-import BookResponse from '@/core/book/dto/responses/book.response'
-import HistoricalLoansResponse from '@/core/loan/dto/responses/historical-loans.response'
-import UserResponse from '@/core/user/dto/responses/user.response'
+import { BookCard } from '@/app/books/components/book-card'
+import { BookViewBreadcrumbs } from '@/app/books/components/book-view-breadcrumbs'
+import { BookResponse } from '@/core/book/dto/responses/book.response'
+import { HistoricalLoansResponse } from '@/core/loan/dto/responses/historical-loans.response'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
 
 interface BookPageProperties {
   book: BookResponse
@@ -25,12 +25,12 @@ interface BookPageProperties {
   user?: UserResponse
 }
 
-export default function BookPage(properties: BookPageProperties) {
+export function BookView(properties: BookPageProperties) {
   const { book, historicalLoans, user } = properties
   return (
     <>
       <main className="flex flex-col gap-4 px-4 md:px-0">
-        <BookBreadcrumbs title={book.title} />
+        <BookViewBreadcrumbs title={book.title} />
         <div className="flex flex-col md:flex-row gap-4">
           <BookCard book={book} me={user} />
           <div className="flex flex-col gap-4">
diff --git a/src/app/books/new/page.tsx b/src/app/books/new/page.tsx
index 46d1599..2749fd5 100644
--- a/src/app/books/new/page.tsx
+++ b/src/app/books/new/page.tsx
@@ -1,7 +1,7 @@
 import { Card, CardBody, CardHeader } from '@nextui-org/react'
 import { Metadata } from 'next'
 
-import BookForm from '@/app/books/_components/book-form/book-form'
+import { BookViewForm } from '@/app/books/components/book-view-form'
 
 export const metadata: Metadata = {
   description: 'Biblioteca del Aula de Software Libre',
@@ -16,7 +16,7 @@ export default async function Page() {
           <h1 className="text-2xl font-extrabold">Añadir un nuevo libro</h1>
         </CardHeader>
         <CardBody className="col-span-1 lg:col-span-2 xl:col-span-3">
-          <BookForm />
+          <BookViewForm />
         </CardBody>
       </Card>
     </main>
diff --git a/src/app/books/page.tsx b/src/app/books/page.tsx
index 296d3cd..0aafe0f 100644
--- a/src/app/books/page.tsx
+++ b/src/app/books/page.tsx
@@ -1,14 +1,14 @@
-import BookGrid from '@/app/books/_components/book-grid/book-grid'
+import { BookCardGrid } from '@/app/books/components/book-card-grid'
 import { findBooks } from '@/core/book/infrastructure/actions/find-books'
-import me from '@/core/user/infrastructure/actions/me'
+import { me } from '@/core/user/infrastructure/actions/me'
 
-export default async function Home() {
+export default async function Page() {
   const books = await findBooks()
   const user = await me()
 
   return (
     <main>
-      <BookGrid books={books} me={user} />
+      <BookCardGrid books={books} me={user} />
     </main>
   )
 }
diff --git a/src/app/_components/footer/footer.tsx b/src/app/components/footer.tsx
similarity index 89%
rename from src/app/_components/footer/footer.tsx
rename to src/app/components/footer.tsx
index 8f68779..8b26893 100644
--- a/src/app/_components/footer/footer.tsx
+++ b/src/app/components/footer.tsx
@@ -1,8 +1,8 @@
 import { Link, Navbar, NavbarContent, NavbarItem } from '@nextui-org/react'
 
-import ThemeImage from '@/components/theme-image/theme-image'
+import { ThemeImage } from '@/components/image/theme-image'
 
-export default function Footer() {
+export function Footer() {
   return (
     <>
       <Navbar position="static" className="h-24">
diff --git a/src/app/_components/header/header-authenticated-menu.tsx b/src/app/components/header-authenticated-menu.tsx
similarity index 94%
rename from src/app/_components/header/header-authenticated-menu.tsx
rename to src/app/components/header-authenticated-menu.tsx
index ffbef1c..cb134a6 100644
--- a/src/app/_components/header/header-authenticated-menu.tsx
+++ b/src/app/components/header-authenticated-menu.tsx
@@ -14,8 +14,8 @@ import {
 } from '@nextui-org/react'
 import { useRouter } from 'next/navigation'
 
-import UserResponse from '@/core/user/dto/responses/user.response'
-import gravatar from '@/lib/utils/gravatar'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
+import { gravatar } from '@/lib/utils/gravatar'
 
 interface HeaderAuthenticatedMenuProperties {
   user: UserResponse
@@ -28,7 +28,7 @@ const OPTIONS = [
   { key: 'signout', roles: ['ROLE_USER'], url: '/signout' },
 ]
 
-export default function HeaderAuthenticatedMenu(
+export function HeaderAuthenticatedMenu(
   properties: HeaderAuthenticatedMenuProperties,
 ) {
   const router = useRouter()
diff --git a/src/app/_components/header/header-search-input.tsx b/src/app/components/header-search-input.tsx
similarity index 96%
rename from src/app/_components/header/header-search-input.tsx
rename to src/app/components/header-search-input.tsx
index a06ed4c..8d366c4 100644
--- a/src/app/_components/header/header-search-input.tsx
+++ b/src/app/components/header-search-input.tsx
@@ -26,7 +26,7 @@ function useController() {
   return { onDoSearch }
 }
 
-export default function HeaderSearchInput() {
+export function HeaderSearchInput() {
   const { onDoSearch } = useController()
 
   return (
diff --git a/src/app/_components/header/header-unauthenticated-menu.tsx b/src/app/components/header-unauthenticated-menu.tsx
similarity index 94%
rename from src/app/_components/header/header-unauthenticated-menu.tsx
rename to src/app/components/header-unauthenticated-menu.tsx
index e753a1f..3a8377e 100644
--- a/src/app/_components/header/header-unauthenticated-menu.tsx
+++ b/src/app/components/header-unauthenticated-menu.tsx
@@ -8,7 +8,7 @@ import {
 } from '@nextui-org/react'
 import { useRouter } from 'next/navigation'
 
-export default function HeaderUnauthenticatedMenu() {
+export function HeaderUnauthenticatedMenu() {
   const router = useRouter()
 
   return (
diff --git a/src/app/_components/header/header.tsx b/src/app/components/header.tsx
similarity index 64%
rename from src/app/_components/header/header.tsx
rename to src/app/components/header.tsx
index 1ddd433..6b6f6fe 100644
--- a/src/app/_components/header/header.tsx
+++ b/src/app/components/header.tsx
@@ -8,18 +8,18 @@ import {
 } from '@nextui-org/react'
 import Link from 'next/link'
 
-import HeaderAuthenticatedMenu from '@/app/_components/header/header-authenticated-menu'
-import HeaderSearchInput from '@/app/_components/header/header-search-input'
-import HeaderUnauthenticatedMenu from '@/app/_components/header/header-unauthenticated-menu'
-import Logo from '@/app/_components/header/logo'
-import ThemeSwitcher from '@/app/_components/theme-switcher/theme-switcher'
-import UserResponse from '@/core/user/dto/responses/user.response'
+import { HeaderAuthenticatedMenu } from '@/app/components/header-authenticated-menu'
+import { HeaderSearchInput } from '@/app/components/header-search-input'
+import { HeaderUnauthenticatedMenu } from '@/app/components/header-unauthenticated-menu'
+import { ThemeSwitcher } from '@/app/components/theme-switcher'
+import { Logo } from '@/components/image/logo'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
 
 interface HeaderProperties {
   user?: UserResponse
 }
 
-export default function Header(properties: HeaderProperties) {
+export function Header(properties: HeaderProperties) {
   const { user } = properties
 
   const AuthNavbarItem = user ? (
diff --git a/src/app/_components/theme-switcher/theme-switcher.tsx b/src/app/components/theme-switcher.tsx
similarity index 72%
rename from src/app/_components/theme-switcher/theme-switcher.tsx
rename to src/app/components/theme-switcher.tsx
index 5ec9c67..a49e036 100644
--- a/src/app/_components/theme-switcher/theme-switcher.tsx
+++ b/src/app/components/theme-switcher.tsx
@@ -3,10 +3,10 @@
 import { MoonIcon, SunIcon } from '@heroicons/react/24/solid'
 import { Switch } from '@nextui-org/react'
 
-import { useController } from '@/app/_components/theme-switcher/hooks'
+import { useTheme } from '@/lib/hooks/use-theme'
 
-export default function ThemeSwitcher() {
-  const { mounted, setTheme, theme } = useController()
+export function ThemeSwitcher() {
+  const { mounted, setTheme, theme } = useTheme()
 
   if (!mounted) return
 
diff --git a/src/app/_components/unauthorized-alert/unauthorized-alert.tsx b/src/app/components/unauthorized-alert.tsx
similarity index 82%
rename from src/app/_components/unauthorized-alert/unauthorized-alert.tsx
rename to src/app/components/unauthorized-alert.tsx
index e9185c0..e379634 100644
--- a/src/app/_components/unauthorized-alert/unauthorized-alert.tsx
+++ b/src/app/components/unauthorized-alert.tsx
@@ -1,14 +1,12 @@
 import { Card, CardBody, CardHeader } from '@nextui-org/react'
 
-import UserResponse from '@/core/user/dto/responses/user.response'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
 
 interface UnauthorizedAlertProperties {
   user?: UserResponse
 }
 
-export default function UnauthorizedAlert(
-  properties: UnauthorizedAlertProperties,
-) {
+export function UnauthorizedAlert(properties: UnauthorizedAlertProperties) {
   const { user } = properties
 
   if (
diff --git a/src/app/icon.tsx b/src/app/icon.tsx
index 9a5baa7..1d77d05 100644
--- a/src/app/icon.tsx
+++ b/src/app/icon.tsx
@@ -6,7 +6,8 @@ export const size = {
 }
 export const contentType = 'image/svg'
 
-export default function Logo() {
+// eslint-disable-next-line import/no-default-export
+export default function Icon() {
   return new ImageResponse(
     (
       <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
@@ -25,3 +26,4 @@ export default function Logo() {
     },
   )
 }
+;``
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index bef3e77..a81e84e 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -4,10 +4,10 @@ import type { Metadata } from 'next'
 import { Nunito } from 'next/font/google'
 import { ReactNode } from 'react'
 
-import Footer from '@/app/_components/footer/footer'
-import Header from '@/app/_components/header/header'
-import { Providers } from '@/app/_components/providers/providers'
-import UnauthorizedAlert from '@/app/_components/unauthorized-alert/unauthorized-alert'
+import { Footer } from '@/app/components/footer'
+import { Header } from '@/app/components/header'
+import { UnauthorizedAlert } from '@/app/components/unauthorized-alert'
+import { Providers } from '@/app/providers'
 import { findUser } from '@/core/user/infrastructure/actions/find-user'
 import { auth } from '@/lib/auth/auth'
 
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 9ae92ef..39de1a9 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,5 +1,5 @@
 import { redirect } from 'next/navigation'
 
-export default async function Home() {
+export default async function Page() {
   return redirect('/books')
 }
diff --git a/src/app/_components/providers/providers.tsx b/src/app/providers.tsx
similarity index 100%
rename from src/app/_components/providers/providers.tsx
rename to src/app/providers.tsx
diff --git a/src/app/search/page.tsx b/src/app/search/page.tsx
index 1f8898b..d503999 100644
--- a/src/app/search/page.tsx
+++ b/src/app/search/page.tsx
@@ -1,8 +1,8 @@
 import type { Metadata } from 'next'
 
-import BookGrid from '@/app/books/_components/book-grid/book-grid'
+import { BookCardGrid } from '@/app/books/components/book-card-grid'
 import { searchBooks } from '@/core/book/infrastructure/actions/search-books'
-import me from '@/core/user/infrastructure/actions/me'
+import { me } from '@/core/user/infrastructure/actions/me'
 
 export const metadata: Metadata = {
   description: 'Biblioteca del Aula de Software Libre',
@@ -38,7 +38,7 @@ export default async function Page(properties: PageProperties) {
         <h1 className="font-extrabold text-2xl">
           {message}:<span className="text-default-700 ml-2">{query}</span>
         </h1>
-        <BookGrid books={books} me={user} />
+        <BookCardGrid books={books} me={user} />
       </main>
     </>
   )
diff --git a/src/app/settings/profile/_components/settings-form/settings-form-input-submit.tsx b/src/app/settings/components/settings-form-input-submit.tsx
similarity index 78%
rename from src/app/settings/profile/_components/settings-form/settings-form-input-submit.tsx
rename to src/app/settings/components/settings-form-input-submit.tsx
index a206f0b..b677c1c 100644
--- a/src/app/settings/profile/_components/settings-form/settings-form-input-submit.tsx
+++ b/src/app/settings/components/settings-form-input-submit.tsx
@@ -1,11 +1,11 @@
-import SubmitButton from '@/components/submit-button/submit-button'
+import { SubmitButton } from '@/components/form/submit-button'
 
 interface SettingsFormFooterProperties {
   isDisabled: boolean
   status: string
 }
 
-export default function SettingsFormInputSubmit(
+export function SettingsFormInputSubmit(
   properties: SettingsFormFooterProperties,
 ) {
   const { isDisabled, status } = properties
diff --git a/src/app/settings/profile/_components/settings-form/settings-form-input-text.tsx b/src/app/settings/components/settings-form-input-text.tsx
similarity index 78%
rename from src/app/settings/profile/_components/settings-form/settings-form-input-text.tsx
rename to src/app/settings/components/settings-form-input-text.tsx
index be4f46a..a655213 100644
--- a/src/app/settings/profile/_components/settings-form/settings-form-input-text.tsx
+++ b/src/app/settings/components/settings-form-input-text.tsx
@@ -3,17 +3,15 @@
 import { useEffect, useState } from 'react'
 import { useFormState } from 'react-dom'
 
-import SettingsFormInputSubmit from '@/app/settings/profile/_components/settings-form/settings-form-input-submit'
-import InputForm, {
-  FormInputProperties,
-} from '@/components/input-form/input-form'
-import { showToast } from '@/components/toast/toast'
-import UserResponse from '@/core/user/dto/responses/user.response'
+import { SettingsFormInputSubmit } from '@/app/settings/components/settings-form-input-submit'
+import { FormInputProperties, InputForm } from '@/components/form/input-form'
+import { showToast } from '@/components/form/toast'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
 import {
   UpdatableFields,
   updateSetting,
 } from '@/core/user/infrastructure/actions/update-setting'
-import FormResponse from '@/lib/zod/form-response'
+import { FormResponse } from '@/lib/zod/form-response'
 
 interface SettingsFormInputTextProperties {
   field: UpdatableFields
@@ -38,7 +36,7 @@ function useController(properties: SettingsFormInputTextProperties) {
   return { ...properties, formState, isMutated, setIsMutated }
 }
 
-export default function SettingsFormInputText(
+export function SettingsFormInputText(
   properties: SettingsFormInputTextProperties,
 ) {
   const { field, formState, inputProperties, isMutated, setIsMutated, status } =
diff --git a/src/app/settings/profile/_components/settings-form/settings-form.tsx b/src/app/settings/components/settings-form.tsx
similarity index 88%
rename from src/app/settings/profile/_components/settings-form/settings-form.tsx
rename to src/app/settings/components/settings-form.tsx
index 4ffe5a5..1217508 100644
--- a/src/app/settings/profile/_components/settings-form/settings-form.tsx
+++ b/src/app/settings/components/settings-form.tsx
@@ -6,7 +6,7 @@ interface SettingsFormProperties {
   title: string
 }
 
-export default function SettingsForm(properties: SettingsFormProperties) {
+export function SettingsForm(properties: SettingsFormProperties) {
   const { children, title } = properties
 
   return (
diff --git a/src/app/settings/_components/settings-template/settings-template.tsx b/src/app/settings/components/settings-template.tsx
similarity index 93%
rename from src/app/settings/_components/settings-template/settings-template.tsx
rename to src/app/settings/components/settings-template.tsx
index 45868ea..303c2cb 100644
--- a/src/app/settings/_components/settings-template/settings-template.tsx
+++ b/src/app/settings/components/settings-template.tsx
@@ -15,9 +15,7 @@ interface SettingsTemplateProperties {
   tabs: SettingTab[]
 }
 
-export default function SettingsTemplate(
-  properties: SettingsTemplateProperties,
-) {
+export function SettingsTemplate(properties: SettingsTemplateProperties) {
   const { children, pathname, tabs } = properties
   return (
     <>
diff --git a/src/app/settings/layout.tsx b/src/app/settings/layout.tsx
index 3f99445..9829710 100644
--- a/src/app/settings/layout.tsx
+++ b/src/app/settings/layout.tsx
@@ -3,7 +3,7 @@
 import { usePathname } from 'next/navigation'
 import { ReactNode } from 'react'
 
-import SettingsTemplate from '@/app/settings/_components/settings-template/settings-template'
+import { SettingsTemplate } from '@/app/settings/components/settings-template'
 
 const TABS = [
   {
diff --git a/src/app/settings/profile/page.tsx b/src/app/settings/profile/page.tsx
index e667b09..972be83 100644
--- a/src/app/settings/profile/page.tsx
+++ b/src/app/settings/profile/page.tsx
@@ -1,12 +1,12 @@
 import { Avatar, Link } from '@nextui-org/react'
 import { redirect } from 'next/navigation'
 
-import SettingsForm from '@/app/settings/profile/_components/settings-form/settings-form'
-import SettingsFormInputText from '@/app/settings/profile/_components/settings-form/settings-form-input-text'
-import UserResponse from '@/core/user/dto/responses/user.response'
+import { SettingsForm } from '@/app/settings/components/settings-form'
+import { SettingsFormInputText } from '@/app/settings/components/settings-form-input-text'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
 import { findUser } from '@/core/user/infrastructure/actions/find-user'
 import { auth } from '@/lib/auth/auth'
-import gravatar from '@/lib/utils/gravatar'
+import { gravatar } from '@/lib/utils/gravatar'
 
 export default async function Page() {
   const session = await auth()
diff --git a/src/components/input-form/input-form.tsx b/src/components/form/input-form.tsx
similarity index 84%
rename from src/components/input-form/input-form.tsx
rename to src/components/form/input-form.tsx
index 814bff9..c7e7450 100644
--- a/src/components/input-form/input-form.tsx
+++ b/src/components/form/input-form.tsx
@@ -2,14 +2,14 @@
 
 import { Input, InputProps } from '@nextui-org/react'
 
-import FormResponse from '@/lib/zod/form-response'
+import { FormResponse } from '@/lib/zod/form-response'
 
 export type FormInputProperties = InputProps & {
   label?: string
   state: FormResponse<unknown>
 }
 
-export default function InputForm(properties: FormInputProperties) {
+export function InputForm(properties: FormInputProperties) {
   const { label, name, state, ...rest } = properties
 
   const errors = state.success ? [] : state.errors
diff --git a/src/components/submit-button/submit-button.tsx b/src/components/form/submit-button.tsx
similarity index 86%
rename from src/components/submit-button/submit-button.tsx
rename to src/components/form/submit-button.tsx
index e902154..5054a7d 100644
--- a/src/components/submit-button/submit-button.tsx
+++ b/src/components/form/submit-button.tsx
@@ -6,7 +6,7 @@ import { useFormStatus } from 'react-dom'
 
 export type SubmitButtonProperties = React.ComponentProps<typeof Button>
 
-export default function SubmitButton(properties: SubmitButtonProperties) {
+export function SubmitButton(properties: SubmitButtonProperties) {
   const { pending } = useFormStatus()
   const { children = 'Enviar' } = properties
 
diff --git a/src/components/toast/toast.tsx b/src/components/form/toast.tsx
similarity index 96%
rename from src/components/toast/toast.tsx
rename to src/components/form/toast.tsx
index 788f5be..cc8a2d4 100644
--- a/src/components/toast/toast.tsx
+++ b/src/components/form/toast.tsx
@@ -16,7 +16,7 @@ export function showToast(message: string) {
   ))
 }
 
-export default function Toast(properties: ToastProperties) {
+export function Toast(properties: ToastProperties) {
   const { message, onCloseHandler } = properties
 
   return (
diff --git a/src/app/_components/header/logo.tsx b/src/components/image/logo.tsx
similarity index 95%
rename from src/app/_components/header/logo.tsx
rename to src/components/image/logo.tsx
index 5cafaed..2755739 100644
--- a/src/app/_components/header/logo.tsx
+++ b/src/components/image/logo.tsx
@@ -2,7 +2,7 @@ interface LogoProperties {
   className: string
 }
 
-export default function Logo(properties: LogoProperties) {
+export function Logo(properties: LogoProperties) {
   return (
     <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" {...properties}>
       <path d="M4.01 17.558c-.635-.06-.495-1.02-.055-1.095 2.498-.425 5.376 3.035 8.332 3.036 2.956.001 5.835-3.456 8.332-3.031.44.074.58 1.036-.055 1.095-2.535.237-5.33 3.103-8.277 3.102-2.947 0-5.741-2.87-8.277-3.107z" />
diff --git a/src/components/theme-image/theme-image.tsx b/src/components/image/theme-image.tsx
similarity index 78%
rename from src/components/theme-image/theme-image.tsx
rename to src/components/image/theme-image.tsx
index 9cadf7f..c721d0f 100644
--- a/src/components/theme-image/theme-image.tsx
+++ b/src/components/image/theme-image.tsx
@@ -2,15 +2,15 @@
 
 import Image, { ImageProps } from 'next/image'
 
-import { useController } from '@/app/_components/theme-switcher/hooks'
+import { useTheme } from '@/lib/hooks/use-theme'
 
 type ThemeImageProperties = Omit<ImageProps, 'src'> & {
   srcDark: string
   srcLight: string
 }
 
-export default function ThemeImage(properties: ThemeImageProperties) {
-  const { mounted, theme } = useController()
+export function ThemeImage(properties: ThemeImageProperties) {
+  const { mounted, theme } = useTheme()
   const { alt, srcDark, srcLight, ...rest } = properties
 
   if (!mounted)
diff --git a/src/components/theme-image/hooks.ts b/src/components/theme-image/hooks.ts
deleted file mode 100644
index 009f3cb..0000000
--- a/src/components/theme-image/hooks.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { useTheme } from 'next-themes'
-import { useEffect, useState } from 'react'
-
-export function useController() {
-  const [mounted, setMounted] = useState(false)
-  const { setTheme, theme } = useTheme()
-
-  useEffect(() => {
-    setMounted(true)
-  }, [setMounted])
-  return { mounted, setTheme, theme }
-}
diff --git a/src/core/book/application/__tests__/create-book.use-case.spec.ts b/src/core/book/application/__tests__/create-book.use-case.spec.ts
index 4f7fd23..fdb9ccf 100644
--- a/src/core/book/application/__tests__/create-book.use-case.spec.ts
+++ b/src/core/book/application/__tests__/create-book.use-case.spec.ts
@@ -1,10 +1,10 @@
 import { describe, expect, it } from 'vitest'
 
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import container from '@/lib/container'
-import prisma from '@/lib/prisma/prisma'
-import unexpected from '@/lib/utils/unexpected'
-import bookRequestExamples from '@/tests/examples/books-request.examples'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { container } from '@/lib/container'
+import { prisma } from '@/lib/prisma/prisma'
+import { unexpected } from '@/lib/utils/unexpected'
+import { bookRequestExamples } from '@/tests/examples/books-request.examples'
 import { createAvailableBook } from '@/tests/examples/factories'
 
 describe('CreateBookUseCase', () => {
diff --git a/src/core/book/application/__tests__/edit-book.use-case.spec.ts b/src/core/book/application/__tests__/edit-book.use-case.spec.ts
index 5f9153f..8c66a16 100644
--- a/src/core/book/application/__tests__/edit-book.use-case.spec.ts
+++ b/src/core/book/application/__tests__/edit-book.use-case.spec.ts
@@ -1,11 +1,11 @@
 import { describe, expect, it } from 'vitest'
 
-import EditBookRequest from '@/core/book/dto/requests/edit-book.request'
-import NotFoundError from '@/core/common/domain/errors/application/not-found-error'
-import container from '@/lib/container'
-import prisma from '@/lib/prisma/prisma'
-import unexpected from '@/lib/utils/unexpected'
-import BooksExamples from '@/tests/examples/books.examples'
+import { EditBookRequest } from '@/core/book/dto/requests/edit-book.request'
+import { NotFoundError } from '@/core/common/domain/errors/application/not-found-error'
+import { container } from '@/lib/container'
+import { prisma } from '@/lib/prisma/prisma'
+import { unexpected } from '@/lib/utils/unexpected'
+import { BooksExamples } from '@/tests/examples/books.examples'
 import { createAvailableBook } from '@/tests/examples/factories'
 
 describe('EditBookUseCase', () => {
diff --git a/src/core/book/application/__tests__/loan-book.use-case.spec.ts b/src/core/book/application/__tests__/loan-book.use-case.spec.ts
index 40c5028..470d8c9 100644
--- a/src/core/book/application/__tests__/loan-book.use-case.spec.ts
+++ b/src/core/book/application/__tests__/loan-book.use-case.spec.ts
@@ -1,10 +1,10 @@
 import { describe, expect, it } from 'vitest'
 
-import LoanBookRequest from '@/core/book/dto/requests/loan-book.request'
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import container from '@/lib/container'
-import prisma from '@/lib/prisma/prisma'
-import unexpected from '@/lib/utils/unexpected'
+import { LoanBookRequest } from '@/core/book/dto/requests/loan-book.request'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { container } from '@/lib/container'
+import { prisma } from '@/lib/prisma/prisma'
+import { unexpected } from '@/lib/utils/unexpected'
 import {
   createAvailableBook,
   createLoan,
diff --git a/src/core/book/application/__tests__/return-book.use-case.spec.ts b/src/core/book/application/__tests__/return-book.use-case.spec.ts
index 28d2911..2e5a243 100644
--- a/src/core/book/application/__tests__/return-book.use-case.spec.ts
+++ b/src/core/book/application/__tests__/return-book.use-case.spec.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it } from 'vitest'
 
-import ReturnBookRequest from '@/core/book/dto/requests/return-book.request'
-import container from '@/lib/container'
-import prisma from '@/lib/prisma/prisma'
-import unexpected from '@/lib/utils/unexpected'
+import { ReturnBookRequest } from '@/core/book/dto/requests/return-book.request'
+import { container } from '@/lib/container'
+import { prisma } from '@/lib/prisma/prisma'
+import { unexpected } from '@/lib/utils/unexpected'
 import {
   createLoan,
   createLoanedBook,
diff --git a/src/core/book/application/create-book.use-case.ts b/src/core/book/application/create-book.use-case.ts
index 623d9b3..f82945f 100644
--- a/src/core/book/application/create-book.use-case.ts
+++ b/src/core/book/application/create-book.use-case.ts
@@ -1,8 +1,8 @@
-import BookFactory from '@/core/book/domain/model/book.factory'
-import Books from '@/core/book/domain/services/books.repository'
-import CreateBookRequest from '@/core/book/dto/requests/create-book.request'
+import { BookFactory } from '@/core/book/domain/model/book.factory'
+import { Books } from '@/core/book/domain/services/books.repository'
+import { CreateBookRequest } from '@/core/book/dto/requests/create-book.request'
 
-export default class CreateBookUseCase {
+export class CreateBookUseCase {
   constructor(private readonly books: Books) {}
 
   async with(command: CreateBookRequest) {
diff --git a/src/core/book/application/edit-book.use-case.ts b/src/core/book/application/edit-book.use-case.ts
index dd1e400..35ebf0b 100644
--- a/src/core/book/application/edit-book.use-case.ts
+++ b/src/core/book/application/edit-book.use-case.ts
@@ -1,17 +1,17 @@
 import { okAsync, Result, ResultAsync } from 'neverthrow'
 
-import Book from '@/core/book/domain/model/book.entity'
-import Books from '@/core/book/domain/services/books.repository'
-import EditBookRequest from '@/core/book/dto/requests/edit-book.request'
-import NotFoundError from '@/core/common/domain/errors/application/not-found-error'
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import DomainError from '@/core/common/domain/errors/domain-error'
-import BookId from '@/core/common/domain/value-objects/book-id'
-import FullNames from '@/core/common/domain/value-objects/fullnames'
-import Image from '@/core/common/domain/value-objects/image'
-import Title from '@/core/common/domain/value-objects/title'
+import { Book } from '@/core/book/domain/model/book.entity'
+import { Books } from '@/core/book/domain/services/books.repository'
+import { EditBookRequest } from '@/core/book/dto/requests/edit-book.request'
+import { NotFoundError } from '@/core/common/domain/errors/application/not-found-error'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { BookId } from '@/core/common/domain/value-objects/book-id'
+import { FullNames } from '@/core/common/domain/value-objects/fullnames'
+import { Image } from '@/core/common/domain/value-objects/image'
+import { Title } from '@/core/common/domain/value-objects/title'
 
-export default class EditBookUseCase {
+export class EditBookUseCase {
   constructor(private readonly books: Books) {}
 
   async with(command: EditBookRequest) {
diff --git a/src/core/book/application/loan-book-use.case.ts b/src/core/book/application/loan-book-use.case.ts
index 162bebb..45a4024 100644
--- a/src/core/book/application/loan-book-use.case.ts
+++ b/src/core/book/application/loan-book-use.case.ts
@@ -1,11 +1,11 @@
-import AvailableBook from '@/core/book/domain/model/available-book.entity'
-import Books from '@/core/book/domain/services/books.repository'
-import LoanBookRequest from '@/core/book/dto/requests/loan-book.request'
-import BookId from '@/core/common/domain/value-objects/book-id'
-import UserId from '@/core/common/domain/value-objects/user-id'
-import LoanBookService from '@/core/loan/domain/services/loan-book.service'
+import { AvailableBook } from '@/core/book/domain/model/available-book.entity'
+import { Books } from '@/core/book/domain/services/books.repository'
+import { LoanBookRequest } from '@/core/book/dto/requests/loan-book.request'
+import { BookId } from '@/core/common/domain/value-objects/book-id'
+import { UserId } from '@/core/common/domain/value-objects/user-id'
+import { LoanBookService } from '@/core/loan/domain/services/loan-book.service'
 
-export default class LoanBookUseCase {
+export class LoanBookUseCase {
   constructor(
     private readonly books: Books,
     private readonly loanBookService: LoanBookService,
diff --git a/src/core/book/application/return-book.use-case.ts b/src/core/book/application/return-book.use-case.ts
index 6c9df33..229f5c7 100644
--- a/src/core/book/application/return-book.use-case.ts
+++ b/src/core/book/application/return-book.use-case.ts
@@ -1,10 +1,10 @@
-import LoanedBook from '@/core/book/domain/model/loaned-book.entity'
-import Books from '@/core/book/domain/services/books.repository'
-import ReturnBookRequest from '@/core/book/dto/requests/return-book.request'
-import BookId from '@/core/common/domain/value-objects/book-id'
-import ReturnBookService from '@/core/loan/domain/services/return-book.service'
+import { LoanedBook } from '@/core/book/domain/model/loaned-book.entity'
+import { Books } from '@/core/book/domain/services/books.repository'
+import { ReturnBookRequest } from '@/core/book/dto/requests/return-book.request'
+import { BookId } from '@/core/common/domain/value-objects/book-id'
+import { ReturnBookService } from '@/core/loan/domain/services/return-book.service'
 
-export default class ReturnBookUseCase {
+export class ReturnBookUseCase {
   constructor(
     private readonly books: Books,
     private readonly returnBookService: ReturnBookService,
diff --git a/src/core/book/domain/model/available-book.entity.ts b/src/core/book/domain/model/available-book.entity.ts
index 6df0dac..d4e9f7b 100644
--- a/src/core/book/domain/model/available-book.entity.ts
+++ b/src/core/book/domain/model/available-book.entity.ts
@@ -1,12 +1,12 @@
 import { ResultAsync } from 'neverthrow'
 
-import Book, { BookState } from '@/core/book/domain/model/book.entity'
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import UserId from '@/core/common/domain/value-objects/user-id'
-import ignore from '@/core/common/utils/ignore'
-import LoanBookService from '@/core/loan/domain/services/loan-book.service'
+import { Book, BookState } from '@/core/book/domain/model/book.entity'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { UserId } from '@/core/common/domain/value-objects/user-id'
+import { ignore } from '@/core/common/utils/ignore'
+import { LoanBookService } from '@/core/loan/domain/services/loan-book.service'
 
-export default class AvailableBook extends Book {
+export class AvailableBook extends Book {
   loanTo(
     userId: UserId,
     loanBookService: LoanBookService,
diff --git a/src/core/book/domain/model/book.entity.ts b/src/core/book/domain/model/book.entity.ts
index 99d3658..b3f2c66 100644
--- a/src/core/book/domain/model/book.entity.ts
+++ b/src/core/book/domain/model/book.entity.ts
@@ -1,15 +1,15 @@
-import AggregateRoot from '@/core/common/domain/model/aggregate-root'
-import BookId from '@/core/common/domain/value-objects/book-id'
-import FullNames from '@/core/common/domain/value-objects/fullnames'
-import Image from '@/core/common/domain/value-objects/image'
-import Title from '@/core/common/domain/value-objects/title'
+import { AggregateRoot } from '@/core/common/domain/model/aggregate-root'
+import { BookId } from '@/core/common/domain/value-objects/book-id'
+import { FullNames } from '@/core/common/domain/value-objects/fullnames'
+import { Image } from '@/core/common/domain/value-objects/image'
+import { Title } from '@/core/common/domain/value-objects/title'
 
 export enum BookState {
   AVAILABLE = 'AVAILABLE',
   LOANED = 'LOANED',
 }
 
-export default abstract class Book extends AggregateRoot {
+export abstract class Book extends AggregateRoot {
   constructor(
     protected _id: BookId,
     protected _title: Title,
diff --git a/src/core/book/domain/model/book.factory.ts b/src/core/book/domain/model/book.factory.ts
index de3be42..af54a62 100644
--- a/src/core/book/domain/model/book.factory.ts
+++ b/src/core/book/domain/model/book.factory.ts
@@ -1,14 +1,14 @@
 import { ok, Result, safeTry } from 'neverthrow'
 
-import AvailableBook from '@/core/book/domain/model/available-book.entity'
-import BookResponse from '@/core/book/dto/responses/book.response'
-import DomainError from '@/core/common/domain/errors/domain-error'
-import BookId from '@/core/common/domain/value-objects/book-id'
-import FullNames from '@/core/common/domain/value-objects/fullnames'
-import Image from '@/core/common/domain/value-objects/image'
-import Title from '@/core/common/domain/value-objects/title'
+import { AvailableBook } from '@/core/book/domain/model/available-book.entity'
+import { BookResponse } from '@/core/book/dto/responses/book.response'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { BookId } from '@/core/common/domain/value-objects/book-id'
+import { FullNames } from '@/core/common/domain/value-objects/fullnames'
+import { Image } from '@/core/common/domain/value-objects/image'
+import { Title } from '@/core/common/domain/value-objects/title'
 
-const BookFactory = {
+export const BookFactory = {
   create: (bookResponse: BookResponse): Result<AvailableBook, DomainError> =>
     safeTry<AvailableBook, DomainError>(function* () {
       const bookId = yield* BookId.create(bookResponse.id)
@@ -27,5 +27,3 @@ const BookFactory = {
       return ok(new AvailableBook(bookId, title, authors, image))
     }),
 }
-
-export default BookFactory
diff --git a/src/core/book/domain/model/loaned-book.entity.ts b/src/core/book/domain/model/loaned-book.entity.ts
index 6c65be0..473b6bc 100644
--- a/src/core/book/domain/model/loaned-book.entity.ts
+++ b/src/core/book/domain/model/loaned-book.entity.ts
@@ -1,16 +1,16 @@
 import { ResultAsync } from 'neverthrow'
 
-import Book, { BookState } from '@/core/book/domain/model/book.entity'
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import BookId from '@/core/common/domain/value-objects/book-id'
-import FullNames from '@/core/common/domain/value-objects/fullnames'
-import Image from '@/core/common/domain/value-objects/image'
-import Title from '@/core/common/domain/value-objects/title'
-import ignore from '@/core/common/utils/ignore'
-import Loan from '@/core/loan/domain/model/loan.entity'
-import ReturnBookService from '@/core/loan/domain/services/return-book.service'
+import { Book, BookState } from '@/core/book/domain/model/book.entity'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { BookId } from '@/core/common/domain/value-objects/book-id'
+import { FullNames } from '@/core/common/domain/value-objects/fullnames'
+import { Image } from '@/core/common/domain/value-objects/image'
+import { Title } from '@/core/common/domain/value-objects/title'
+import { ignore } from '@/core/common/utils/ignore'
+import { Loan } from '@/core/loan/domain/model/loan.entity'
+import { ReturnBookService } from '@/core/loan/domain/services/return-book.service'
 
-export default class LoanedBook extends Book {
+export class LoanedBook extends Book {
   constructor(
     protected _id: BookId,
     protected _title: Title,
diff --git a/src/core/book/domain/services/books.repository.ts b/src/core/book/domain/services/books.repository.ts
index 7c6c74e..22891da 100644
--- a/src/core/book/domain/services/books.repository.ts
+++ b/src/core/book/domain/services/books.repository.ts
@@ -1,13 +1,13 @@
 import { ResultAsync } from 'neverthrow'
 
-import AvailableBook from '@/core/book/domain/model/available-book.entity'
-import Book from '@/core/book/domain/model/book.entity'
-import LoanedBook from '@/core/book/domain/model/loaned-book.entity'
-import NotFoundError from '@/core/common/domain/errors/application/not-found-error'
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import BookId from '@/core/common/domain/value-objects/book-id'
+import { AvailableBook } from '@/core/book/domain/model/available-book.entity'
+import { Book } from '@/core/book/domain/model/book.entity'
+import { LoanedBook } from '@/core/book/domain/model/loaned-book.entity'
+import { NotFoundError } from '@/core/common/domain/errors/application/not-found-error'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { BookId } from '@/core/common/domain/value-objects/book-id'
 
-export default interface Books {
+export interface Books {
   findAvailable(id: BookId): ResultAsync<AvailableBook, NotFoundError>
   findLoaned(id: BookId): ResultAsync<LoanedBook, NotFoundError>
   save(book: Book): ResultAsync<void, ApplicationError>
diff --git a/src/core/book/dto/requests/create-book.request.ts b/src/core/book/dto/requests/create-book.request.ts
index 2d90424..e9f7bb4 100644
--- a/src/core/book/dto/requests/create-book.request.ts
+++ b/src/core/book/dto/requests/create-book.request.ts
@@ -11,4 +11,4 @@ const CreateBookRequest = {
   with: (properties: CreateBookRequest) => properties,
 }
 
-export default CreateBookRequest
+export { CreateBookRequest }
diff --git a/src/core/book/dto/requests/edit-book.request.ts b/src/core/book/dto/requests/edit-book.request.ts
index c431875..0a99d32 100644
--- a/src/core/book/dto/requests/edit-book.request.ts
+++ b/src/core/book/dto/requests/edit-book.request.ts
@@ -13,4 +13,4 @@ const EditBookRequest = {
   with: (properties: EditBookPayload): EditBookRequest => properties,
 }
 
-export default EditBookRequest
+export { EditBookRequest }
diff --git a/src/core/book/dto/requests/loan-book.request.ts b/src/core/book/dto/requests/loan-book.request.ts
index 2fa9a36..86b9654 100644
--- a/src/core/book/dto/requests/loan-book.request.ts
+++ b/src/core/book/dto/requests/loan-book.request.ts
@@ -9,4 +9,4 @@ const LoanBookRequest = {
   with: (properties: LoanBookRequest) => properties,
 }
 
-export default LoanBookRequest
+export { LoanBookRequest }
diff --git a/src/core/book/dto/requests/return-book.request.ts b/src/core/book/dto/requests/return-book.request.ts
index 0a68c81..77c5dda 100644
--- a/src/core/book/dto/requests/return-book.request.ts
+++ b/src/core/book/dto/requests/return-book.request.ts
@@ -8,4 +8,4 @@ const ReturnBookRequest = {
   with: (properties: ReturnBookRequest) => properties,
 }
 
-export default ReturnBookRequest
+export { ReturnBookRequest }
diff --git a/src/core/book/dto/requests/search-book.requests.ts b/src/core/book/dto/requests/search-book.requests.ts
index 4624db0..fe9b98a 100644
--- a/src/core/book/dto/requests/search-book.requests.ts
+++ b/src/core/book/dto/requests/search-book.requests.ts
@@ -10,4 +10,4 @@ const SearchBookRequest = {
   with: (properties: SearchBookPayload): SearchBookRequest => properties,
 }
 
-export default SearchBookRequest
+export { SearchBookRequest }
diff --git a/src/core/book/dto/responses/book.response.ts b/src/core/book/dto/responses/book.response.ts
index 36c596e..b126212 100644
--- a/src/core/book/dto/responses/book.response.ts
+++ b/src/core/book/dto/responses/book.response.ts
@@ -1,7 +1,7 @@
 import { DeepReadonly } from 'ts-essentials'
 
-import BookType from '@/core/book/infrastructure/persistence/book.type'
-import gravatar from '@/lib/utils/gravatar'
+import { BookType } from '@/core/book/infrastructure/persistence/book.type'
+import { gravatar } from '@/lib/utils/gravatar'
 
 type BookResponse = DeepReadonly<{
   authors: string[]
@@ -43,4 +43,4 @@ const BookResponse = {
   },
 }
 
-export default BookResponse
+export { BookResponse }
diff --git a/src/core/book/infrastructure/actions/create-book.ts b/src/core/book/infrastructure/actions/create-book.ts
index 93a14cd..aaae7d6 100644
--- a/src/core/book/infrastructure/actions/create-book.ts
+++ b/src/core/book/infrastructure/actions/create-book.ts
@@ -4,9 +4,9 @@ import { revalidateTag } from 'next/cache'
 import { ulid } from 'ulid'
 import { z } from 'zod'
 
-import CreateBookRequest from '@/core/book/dto/requests/create-book.request'
-import container from '@/lib/container'
-import FormResponse from '@/lib/zod/form-response'
+import { CreateBookRequest } from '@/core/book/dto/requests/create-book.request'
+import { container } from '@/lib/container'
+import { FormResponse } from '@/lib/zod/form-response'
 
 export interface CreateBookForm {
   authors: string
diff --git a/src/core/book/infrastructure/actions/edit-book.ts b/src/core/book/infrastructure/actions/edit-book.ts
index d99fd1b..8d26492 100644
--- a/src/core/book/infrastructure/actions/edit-book.ts
+++ b/src/core/book/infrastructure/actions/edit-book.ts
@@ -3,9 +3,9 @@
 import { revalidateTag } from 'next/cache'
 import { z } from 'zod'
 
-import EditBookRequest from '@/core/book/dto/requests/edit-book.request'
-import container from '@/lib/container'
-import FormResponse from '@/lib/zod/form-response'
+import { EditBookRequest } from '@/core/book/dto/requests/edit-book.request'
+import { container } from '@/lib/container'
+import { FormResponse } from '@/lib/zod/form-response'
 
 export interface EditBookForm {
   authors: string
diff --git a/src/core/book/infrastructure/actions/find-book.ts b/src/core/book/infrastructure/actions/find-book.ts
index d0b1ab8..6d131ab 100644
--- a/src/core/book/infrastructure/actions/find-book.ts
+++ b/src/core/book/infrastructure/actions/find-book.ts
@@ -2,8 +2,8 @@
 
 import { unstable_cache as cache } from 'next/cache'
 
-import BookResponse from '@/core/book/dto/responses/book.response'
-import container from '@/lib/container'
+import { BookResponse } from '@/core/book/dto/responses/book.response'
+import { container } from '@/lib/container'
 
 export async function findBook(
   bookId: string,
diff --git a/src/core/book/infrastructure/actions/find-books.ts b/src/core/book/infrastructure/actions/find-books.ts
index 38fc284..3a58f12 100644
--- a/src/core/book/infrastructure/actions/find-books.ts
+++ b/src/core/book/infrastructure/actions/find-books.ts
@@ -2,8 +2,8 @@
 
 import { unstable_cache as cache } from 'next/cache'
 
-import BookResponse from '@/core/book/dto/responses/book.response'
-import container from '@/lib/container'
+import { BookResponse } from '@/core/book/dto/responses/book.response'
+import { container } from '@/lib/container'
 
 export async function findBooks(): Promise<BookResponse[]> {
   const getCachedBooks = cache(
diff --git a/src/core/book/infrastructure/actions/search-books.ts b/src/core/book/infrastructure/actions/search-books.ts
index c9b56f7..42228cc 100644
--- a/src/core/book/infrastructure/actions/search-books.ts
+++ b/src/core/book/infrastructure/actions/search-books.ts
@@ -2,9 +2,9 @@
 
 import { unstable_cache as cache } from 'next/dist/server/web/spec-extension/unstable-cache'
 
-import SearchBookRequest from '@/core/book/dto/requests/search-book.requests'
-import BookResponse from '@/core/book/dto/responses/book.response'
-import container from '@/lib/container'
+import { SearchBookRequest } from '@/core/book/dto/requests/search-book.requests'
+import { BookResponse } from '@/core/book/dto/responses/book.response'
+import { container } from '@/lib/container'
 
 export async function searchBooks(
   request?: SearchBookRequest,
diff --git a/src/core/book/infrastructure/persistence/book.data-mapper.ts b/src/core/book/infrastructure/persistence/book.data-mapper.ts
index 5d07c5f..9c9337a 100644
--- a/src/core/book/infrastructure/persistence/book.data-mapper.ts
+++ b/src/core/book/infrastructure/persistence/book.data-mapper.ts
@@ -1,15 +1,15 @@
-import AvailableBook from '@/core/book/domain/model/available-book.entity'
-import Book from '@/core/book/domain/model/book.entity'
-import LoanedBook from '@/core/book/domain/model/loaned-book.entity'
-import BookType from '@/core/book/infrastructure/persistence/book.type'
-import BookId from '@/core/common/domain/value-objects/book-id'
-import FullName from '@/core/common/domain/value-objects/fullname'
-import FullNames from '@/core/common/domain/value-objects/fullnames'
-import Image from '@/core/common/domain/value-objects/image'
-import LoanId from '@/core/common/domain/value-objects/loan-id'
-import Title from '@/core/common/domain/value-objects/title'
-import UserId from '@/core/common/domain/value-objects/user-id'
-import Loan from '@/core/loan/domain/model/loan.entity'
+import { AvailableBook } from '@/core/book/domain/model/available-book.entity'
+import { Book } from '@/core/book/domain/model/book.entity'
+import { LoanedBook } from '@/core/book/domain/model/loaned-book.entity'
+import { BookType } from '@/core/book/infrastructure/persistence/book.type'
+import { BookId } from '@/core/common/domain/value-objects/book-id'
+import { FullName } from '@/core/common/domain/value-objects/fullname'
+import { FullNames } from '@/core/common/domain/value-objects/fullnames'
+import { Image } from '@/core/common/domain/value-objects/image'
+import { LoanId } from '@/core/common/domain/value-objects/loan-id'
+import { Title } from '@/core/common/domain/value-objects/title'
+import { UserId } from '@/core/common/domain/value-objects/user-id'
+import { Loan } from '@/core/loan/domain/model/loan.entity'
 
 const BookDataMapper = {
   toAvailableBook: (book: BookType): AvailableBook =>
@@ -44,4 +44,4 @@ const BookDataMapper = {
   }),
 } as const
 
-export default BookDataMapper
+export { BookDataMapper }
diff --git a/src/core/book/infrastructure/persistence/book.publisher.ts b/src/core/book/infrastructure/persistence/book.publisher.ts
index 35882f6..f834078 100644
--- a/src/core/book/infrastructure/persistence/book.publisher.ts
+++ b/src/core/book/infrastructure/persistence/book.publisher.ts
@@ -1,12 +1,12 @@
 import { PrismaClient } from '@prisma/client'
 import { ResultAsync } from 'neverthrow'
 
-import Book from '@/core/book/domain/model/book.entity'
-import BookDataMapper from '@/core/book/infrastructure/persistence/book.data-mapper'
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import Publisher from '@/core/common/domain/publisher/publisher'
+import { Book } from '@/core/book/domain/model/book.entity'
+import { BookDataMapper } from '@/core/book/infrastructure/persistence/book.data-mapper'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { Publisher } from '@/core/common/domain/publisher/publisher'
 
-export default class BookPublisher extends Publisher<Book> {
+export class BookPublisher extends Publisher<Book> {
   constructor(private readonly prisma: PrismaClient) {
     super()
   }
diff --git a/src/core/book/infrastructure/persistence/book.type.ts b/src/core/book/infrastructure/persistence/book.type.ts
index 8a10c70..e617072 100644
--- a/src/core/book/infrastructure/persistence/book.type.ts
+++ b/src/core/book/infrastructure/persistence/book.type.ts
@@ -1,7 +1,5 @@
 import { Prisma } from '@prisma/client'
 
-type BookType = Prisma.BookGetPayload<{
+export type BookType = Prisma.BookGetPayload<{
   include: { loan: { include: { user: true } } }
 }>
-
-export default BookType
diff --git a/src/core/book/infrastructure/queries/find-all-books.query.ts b/src/core/book/infrastructure/queries/find-all-books.query.ts
index 1f85d3c..2ded175 100644
--- a/src/core/book/infrastructure/queries/find-all-books.query.ts
+++ b/src/core/book/infrastructure/queries/find-all-books.query.ts
@@ -1,12 +1,12 @@
 import { PrismaClient } from '@prisma/client'
 import { okAsync, ResultAsync } from 'neverthrow'
 
-import SearchBookRequest from '@/core/book/dto/requests/search-book.requests'
-import BookResponse from '@/core/book/dto/responses/book.response'
-import BookType from '@/core/book/infrastructure/persistence/book.type'
-import ApplicationError from '@/core/common/domain/errors/application-error'
+import { SearchBookRequest } from '@/core/book/dto/requests/search-book.requests'
+import { BookResponse } from '@/core/book/dto/responses/book.response'
+import { BookType } from '@/core/book/infrastructure/persistence/book.type'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
 
-export default class FindAllBooksQuery {
+export class FindAllBooksQuery {
   constructor(private readonly prisma: PrismaClient) {}
 
   with(
diff --git a/src/core/book/infrastructure/queries/find-book.query.ts b/src/core/book/infrastructure/queries/find-book.query.ts
index 2ad5718..a67196e 100644
--- a/src/core/book/infrastructure/queries/find-book.query.ts
+++ b/src/core/book/infrastructure/queries/find-book.query.ts
@@ -1,11 +1,11 @@
 import { PrismaClient } from '@prisma/client'
 import { okAsync, ResultAsync } from 'neverthrow'
 
-import BookResponse from '@/core/book/dto/responses/book.response'
-import BookType from '@/core/book/infrastructure/persistence/book.type'
-import ApplicationError from '@/core/common/domain/errors/application-error'
+import { BookResponse } from '@/core/book/dto/responses/book.response'
+import { BookType } from '@/core/book/infrastructure/persistence/book.type'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
 
-export default class FindBookQuery {
+export class FindBookQuery {
   constructor(private readonly prisma: PrismaClient) {}
 
   with(bookId: string): ResultAsync<BookResponse, ApplicationError> {
diff --git a/src/core/book/infrastructure/services/books-prisma.repository.ts b/src/core/book/infrastructure/services/books-prisma.repository.ts
index 889c57f..5378d7f 100644
--- a/src/core/book/infrastructure/services/books-prisma.repository.ts
+++ b/src/core/book/infrastructure/services/books-prisma.repository.ts
@@ -1,18 +1,18 @@
 import { BookState, PrismaClient } from '@prisma/client'
 import { okAsync, ResultAsync } from 'neverthrow'
 
-import AvailableBook from '@/core/book/domain/model/available-book.entity'
-import Book from '@/core/book/domain/model/book.entity'
-import LoanedBook from '@/core/book/domain/model/loaned-book.entity'
-import Books from '@/core/book/domain/services/books.repository'
-import BookDataMapper from '@/core/book/infrastructure/persistence/book.data-mapper'
-import BookPublisher from '@/core/book/infrastructure/persistence/book.publisher'
-import BookType from '@/core/book/infrastructure/persistence/book.type'
-import NotFoundError from '@/core/common/domain/errors/application/not-found-error'
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import BookId from '@/core/common/domain/value-objects/book-id'
+import { AvailableBook } from '@/core/book/domain/model/available-book.entity'
+import { Book } from '@/core/book/domain/model/book.entity'
+import { LoanedBook } from '@/core/book/domain/model/loaned-book.entity'
+import { Books } from '@/core/book/domain/services/books.repository'
+import { BookDataMapper } from '@/core/book/infrastructure/persistence/book.data-mapper'
+import { BookPublisher } from '@/core/book/infrastructure/persistence/book.publisher'
+import { BookType } from '@/core/book/infrastructure/persistence/book.type'
+import { NotFoundError } from '@/core/common/domain/errors/application/not-found-error'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { BookId } from '@/core/common/domain/value-objects/book-id'
 
-export default class BooksPrisma implements Books {
+export class BooksPrisma implements Books {
   private publisher: BookPublisher
 
   constructor(private readonly prisma: PrismaClient) {
diff --git a/src/core/common/domain/errors/application-error.ts b/src/core/common/domain/errors/application-error.ts
index 80ec453..8d18f38 100644
--- a/src/core/common/domain/errors/application-error.ts
+++ b/src/core/common/domain/errors/application-error.ts
@@ -1 +1 @@
-export default class ApplicationError extends Error {}
+export class ApplicationError extends Error {}
diff --git a/src/core/common/domain/errors/application/duplicate-id-error.ts b/src/core/common/domain/errors/application/duplicate-id-error.ts
index 6a8181a..3fe808e 100644
--- a/src/core/common/domain/errors/application/duplicate-id-error.ts
+++ b/src/core/common/domain/errors/application/duplicate-id-error.ts
@@ -1,7 +1,7 @@
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import Id from '@/core/common/domain/value-objects/id'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { Id } from '@/core/common/domain/value-objects/id'
 
-export default class DuplicateIdError extends ApplicationError {
+export class DuplicateIdError extends ApplicationError {
   static withId(id: Id): DuplicateIdError {
     return new DuplicateIdError(
       `Entity with ${id.toRepresentation()} already exists.`,
diff --git a/src/core/common/domain/errors/application/invalid-version-error.ts b/src/core/common/domain/errors/application/invalid-version-error.ts
index ca9d434..33da485 100644
--- a/src/core/common/domain/errors/application/invalid-version-error.ts
+++ b/src/core/common/domain/errors/application/invalid-version-error.ts
@@ -1,6 +1,6 @@
-import ApplicationError from '@/core/common/domain/errors/application-error'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
 
-export default class InvalidVersionError extends ApplicationError {
+export class InvalidVersionError extends ApplicationError {
   static withVersion(version: number) {
     return new InvalidVersionError(
       `Error trying to persist old version ${version}`,
diff --git a/src/core/common/domain/errors/application/not-found-error.ts b/src/core/common/domain/errors/application/not-found-error.ts
index 7f6406e..faecbee 100644
--- a/src/core/common/domain/errors/application/not-found-error.ts
+++ b/src/core/common/domain/errors/application/not-found-error.ts
@@ -1,7 +1,7 @@
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import Id from '@/core/common/domain/value-objects/id'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { Id } from '@/core/common/domain/value-objects/id'
 
-export default class NotFoundError extends ApplicationError {
+export class NotFoundError extends ApplicationError {
   static withId(id: Id): NotFoundError {
     return new NotFoundError(`Entity with ${id.toRepresentation()} not found.`)
   }
diff --git a/src/core/common/domain/errors/domain-error.ts b/src/core/common/domain/errors/domain-error.ts
index 7b517e4..e528514 100644
--- a/src/core/common/domain/errors/domain-error.ts
+++ b/src/core/common/domain/errors/domain-error.ts
@@ -2,7 +2,7 @@ import { Err, err } from 'neverthrow'
 
 type Constructor<T> = { new (value: string): T }
 
-export default class DomainError extends Error {
+export class DomainError extends Error {
   static cause<T>(this: Constructor<T>, message: string): Err<never, T> {
     return err(new this(message))
   }
diff --git a/src/core/common/domain/model/__tests__/value-object.spec.ts b/src/core/common/domain/model/__tests__/value-object.spec.ts
index aad8949..28249e4 100644
--- a/src/core/common/domain/model/__tests__/value-object.spec.ts
+++ b/src/core/common/domain/model/__tests__/value-object.spec.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
 
-import ValueObject from '@/core/common/domain/model/value-object'
+import { ValueObject } from '@/core/common/domain/model/value-object'
 
 describe('Value Object', () => {
   class ClassA extends ValueObject<string> {
diff --git a/src/core/common/domain/model/aggregate-root.ts b/src/core/common/domain/model/aggregate-root.ts
index 7d75d9a..6989cd2 100644
--- a/src/core/common/domain/model/aggregate-root.ts
+++ b/src/core/common/domain/model/aggregate-root.ts
@@ -1,10 +1,10 @@
 import { errAsync, ResultAsync } from 'neverthrow'
 
-import ApplicationError from '@/core/common/domain/errors/application-error'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
 
 const VERSION = Symbol()
 
-export default abstract class AggregateRoot {
+export abstract class AggregateRoot {
   protected [VERSION] = -1
 
   protected constructor(version: number = -1) {
diff --git a/src/core/common/domain/model/value-object.ts b/src/core/common/domain/model/value-object.ts
index fa3226f..2168876 100644
--- a/src/core/common/domain/model/value-object.ts
+++ b/src/core/common/domain/model/value-object.ts
@@ -1,4 +1,4 @@
-export default abstract class ValueObject<T> {
+export abstract class ValueObject<T> {
   protected constructor(public readonly value: T) {}
 
   equals(other: ValueObject<T>) {
diff --git a/src/core/common/domain/publisher/publisher.ts b/src/core/common/domain/publisher/publisher.ts
index 0c4accd..7a8c121 100644
--- a/src/core/common/domain/publisher/publisher.ts
+++ b/src/core/common/domain/publisher/publisher.ts
@@ -1,9 +1,9 @@
 import { errAsync, okAsync, ResultAsync } from 'neverthrow'
 
-import InvalidVersionError from '@/core/common/domain/errors/application/invalid-version-error'
-import AggregateRoot from '@/core/common/domain/model/aggregate-root'
+import { InvalidVersionError } from '@/core/common/domain/errors/application/invalid-version-error'
+import { AggregateRoot } from '@/core/common/domain/model/aggregate-root'
 
-export default abstract class Publisher<T extends AggregateRoot> {
+export abstract class Publisher<T extends AggregateRoot> {
   protected abstract create(instance: T): ResultAsync<void, InvalidVersionError>
 
   protected abstract update(
diff --git a/src/core/common/domain/value-objects/__tests__/email.spec.ts b/src/core/common/domain/value-objects/__tests__/email.spec.ts
index ed8d2c6..21af080 100644
--- a/src/core/common/domain/value-objects/__tests__/email.spec.ts
+++ b/src/core/common/domain/value-objects/__tests__/email.spec.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from 'vitest'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
-import Email from '@/core/common/domain/value-objects/email'
-import unexpected from '@/lib/utils/unexpected'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { Email } from '@/core/common/domain/value-objects/email'
+import { unexpected } from '@/lib/utils/unexpected'
 
 describe('Email', () => {
   describe('create', () => {
diff --git a/src/core/common/domain/value-objects/__tests__/fullname.spec.ts b/src/core/common/domain/value-objects/__tests__/fullname.spec.ts
index 7032b7b..75c03f0 100644
--- a/src/core/common/domain/value-objects/__tests__/fullname.spec.ts
+++ b/src/core/common/domain/value-objects/__tests__/fullname.spec.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from 'vitest'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
-import FullName from '@/core/common/domain/value-objects/fullname'
-import unexpected from '@/lib/utils/unexpected'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { FullName } from '@/core/common/domain/value-objects/fullname'
+import { unexpected } from '@/lib/utils/unexpected'
 
 describe('FullName', () => {
   describe('create', () => {
diff --git a/src/core/common/domain/value-objects/__tests__/fullnames.spec.ts b/src/core/common/domain/value-objects/__tests__/fullnames.spec.ts
index 8f47d62..219a186 100644
--- a/src/core/common/domain/value-objects/__tests__/fullnames.spec.ts
+++ b/src/core/common/domain/value-objects/__tests__/fullnames.spec.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it } from 'vitest'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
-import FullName from '@/core/common/domain/value-objects/fullname'
-import FullNames from '@/core/common/domain/value-objects/fullnames'
-import unexpected from '@/lib/utils/unexpected'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { FullName } from '@/core/common/domain/value-objects/fullname'
+import { FullNames } from '@/core/common/domain/value-objects/fullnames'
+import { unexpected } from '@/lib/utils/unexpected'
 
 describe('FullNames', () => {
   describe('create', () => {
diff --git a/src/core/common/domain/value-objects/__tests__/image.spec.ts b/src/core/common/domain/value-objects/__tests__/image.spec.ts
index aab068f..36a3bed 100644
--- a/src/core/common/domain/value-objects/__tests__/image.spec.ts
+++ b/src/core/common/domain/value-objects/__tests__/image.spec.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from 'vitest'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
-import Image from '@/core/common/domain/value-objects/image'
-import unexpected from '@/lib/utils/unexpected'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { Image } from '@/core/common/domain/value-objects/image'
+import { unexpected } from '@/lib/utils/unexpected'
 
 describe('Image', () => {
   describe('create', () => {
diff --git a/src/core/common/domain/value-objects/__tests__/role.spec.ts b/src/core/common/domain/value-objects/__tests__/role.spec.ts
index a9f09b3..3544619 100644
--- a/src/core/common/domain/value-objects/__tests__/role.spec.ts
+++ b/src/core/common/domain/value-objects/__tests__/role.spec.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from 'vitest'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
-import Role from '@/core/common/domain/value-objects/role'
-import unexpected from '@/lib/utils/unexpected'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { Role } from '@/core/common/domain/value-objects/role'
+import { unexpected } from '@/lib/utils/unexpected'
 
 describe('Role', () => {
   describe('create', () => {
diff --git a/src/core/common/domain/value-objects/__tests__/roles.spec.ts b/src/core/common/domain/value-objects/__tests__/roles.spec.ts
index a862f75..9022ba4 100644
--- a/src/core/common/domain/value-objects/__tests__/roles.spec.ts
+++ b/src/core/common/domain/value-objects/__tests__/roles.spec.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it } from 'vitest'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
-import Role from '@/core/common/domain/value-objects/role'
-import Roles from '@/core/common/domain/value-objects/roles'
-import unexpected from '@/lib/utils/unexpected'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { Role } from '@/core/common/domain/value-objects/role'
+import { Roles } from '@/core/common/domain/value-objects/roles'
+import { unexpected } from '@/lib/utils/unexpected'
 
 describe('Roles', () => {
   describe('create', () => {
diff --git a/src/core/common/domain/value-objects/__tests__/title.spec.ts b/src/core/common/domain/value-objects/__tests__/title.spec.ts
index 196664c..9345fa1 100644
--- a/src/core/common/domain/value-objects/__tests__/title.spec.ts
+++ b/src/core/common/domain/value-objects/__tests__/title.spec.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from 'vitest'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
-import Title from '@/core/common/domain/value-objects/title'
-import unexpected from '@/lib/utils/unexpected'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { Title } from '@/core/common/domain/value-objects/title'
+import { unexpected } from '@/lib/utils/unexpected'
 
 describe('Title', () => {
   describe('create', () => {
diff --git a/src/core/common/domain/value-objects/book-id.ts b/src/core/common/domain/value-objects/book-id.ts
index af6c48a..d8bd9ff 100644
--- a/src/core/common/domain/value-objects/book-id.ts
+++ b/src/core/common/domain/value-objects/book-id.ts
@@ -1,3 +1,3 @@
-import Id from '@/core/common/domain/value-objects/id'
+import { Id } from '@/core/common/domain/value-objects/id'
 
-export default class BookId extends Id {}
+export class BookId extends Id {}
diff --git a/src/core/common/domain/value-objects/email.ts b/src/core/common/domain/value-objects/email.ts
index 83c84fa..e473822 100644
--- a/src/core/common/domain/value-objects/email.ts
+++ b/src/core/common/domain/value-objects/email.ts
@@ -1,8 +1,8 @@
 import { ok, Result } from 'neverthrow'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
 
-export default class Email {
+export class Email {
   constructor(public readonly value: string) {}
 
   public static create(email: string): Result<Email, DomainError> {
diff --git a/src/core/common/domain/value-objects/fullname.ts b/src/core/common/domain/value-objects/fullname.ts
index 713289b..f5786bb 100644
--- a/src/core/common/domain/value-objects/fullname.ts
+++ b/src/core/common/domain/value-objects/fullname.ts
@@ -1,8 +1,8 @@
 import { ok, Result } from 'neverthrow'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
 
-export default class FullName {
+export class FullName {
   constructor(public readonly value: string) {}
 
   public static create(author: string): Result<FullName, DomainError> {
diff --git a/src/core/common/domain/value-objects/fullnames.ts b/src/core/common/domain/value-objects/fullnames.ts
index a6cc7a6..1f89e4d 100644
--- a/src/core/common/domain/value-objects/fullnames.ts
+++ b/src/core/common/domain/value-objects/fullnames.ts
@@ -1,9 +1,9 @@
 import { err, ok, Result } from 'neverthrow'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
-import FullName from '@/core/common/domain/value-objects/fullname'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { FullName } from '@/core/common/domain/value-objects/fullname'
 
-export default class FullNames {
+export class FullNames {
   private readonly _fullNames: FullName[]
 
   constructor(fullNames: FullName[]) {
diff --git a/src/core/common/domain/value-objects/id.spec.ts b/src/core/common/domain/value-objects/id.spec.ts
index d7a4280..49a49f0 100644
--- a/src/core/common/domain/value-objects/id.spec.ts
+++ b/src/core/common/domain/value-objects/id.spec.ts
@@ -1,8 +1,8 @@
 import { ulid } from 'ulid'
 import { describe, expect, it } from 'vitest'
 
-import Id from '@/core/common/domain/value-objects/id'
-import unexpected from '@/lib/utils/unexpected'
+import { Id } from '@/core/common/domain/value-objects/id'
+import { unexpected } from '@/lib/utils/unexpected'
 
 describe('Id', () => {
   describe('create', () => {
diff --git a/src/core/common/domain/value-objects/id.ts b/src/core/common/domain/value-objects/id.ts
index 12751c2..c32e5fe 100644
--- a/src/core/common/domain/value-objects/id.ts
+++ b/src/core/common/domain/value-objects/id.ts
@@ -1,12 +1,12 @@
 import { ok, Result } from 'neverthrow'
 import { ulid } from 'ulid'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
-import ValueObject from '@/core/common/domain/model/value-object'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { ValueObject } from '@/core/common/domain/model/value-object'
 
 type Constructor<T> = { new (value: string): T }
 
-export default class Id extends ValueObject<string> {
+export class Id extends ValueObject<string> {
   constructor(value: string) {
     super(value)
   }
diff --git a/src/core/common/domain/value-objects/image.ts b/src/core/common/domain/value-objects/image.ts
index d63bc99..528aea3 100644
--- a/src/core/common/domain/value-objects/image.ts
+++ b/src/core/common/domain/value-objects/image.ts
@@ -1,8 +1,8 @@
 import { ok, Result } from 'neverthrow'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
 
-export default class Image {
+export class Image {
   constructor(public readonly value: string) {}
 
   static create(name: string): Result<Image, DomainError> {
diff --git a/src/core/common/domain/value-objects/loan-id.ts b/src/core/common/domain/value-objects/loan-id.ts
index 055e723..31c75d5 100644
--- a/src/core/common/domain/value-objects/loan-id.ts
+++ b/src/core/common/domain/value-objects/loan-id.ts
@@ -1,3 +1,3 @@
-import Id from '@/core/common/domain/value-objects/id'
+import { Id } from '@/core/common/domain/value-objects/id'
 
-export default class LoanId extends Id {}
+export class LoanId extends Id {}
diff --git a/src/core/common/domain/value-objects/role.ts b/src/core/common/domain/value-objects/role.ts
index f6975ff..352b13c 100644
--- a/src/core/common/domain/value-objects/role.ts
+++ b/src/core/common/domain/value-objects/role.ts
@@ -1,9 +1,9 @@
 import { ok, Result } from 'neverthrow'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
-import ValueObject from '@/core/common/domain/model/value-object'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { ValueObject } from '@/core/common/domain/model/value-object'
 
-export default class Role extends ValueObject<string> {
+export class Role extends ValueObject<string> {
   constructor(public readonly value: string) {
     super(value)
   }
diff --git a/src/core/common/domain/value-objects/roles.ts b/src/core/common/domain/value-objects/roles.ts
index 2f61c2c..1c1c5e3 100644
--- a/src/core/common/domain/value-objects/roles.ts
+++ b/src/core/common/domain/value-objects/roles.ts
@@ -1,9 +1,9 @@
 import { err, ok, Result } from 'neverthrow'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
-import Role from '@/core/common/domain/value-objects/role'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { Role } from '@/core/common/domain/value-objects/role'
 
-export default class Roles {
+export class Roles {
   private readonly _roles: Role[]
 
   constructor(roles: Role[]) {
diff --git a/src/core/common/domain/value-objects/title.ts b/src/core/common/domain/value-objects/title.ts
index 8626a80..601cde3 100644
--- a/src/core/common/domain/value-objects/title.ts
+++ b/src/core/common/domain/value-objects/title.ts
@@ -1,8 +1,8 @@
 import { ok, Result } from 'neverthrow'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
 
-export default class Title {
+export class Title {
   constructor(public readonly value: string) {}
 
   public static create(author: string): Result<Title, DomainError> {
diff --git a/src/core/common/domain/value-objects/user-id.ts b/src/core/common/domain/value-objects/user-id.ts
index ac792f3..97f5baa 100644
--- a/src/core/common/domain/value-objects/user-id.ts
+++ b/src/core/common/domain/value-objects/user-id.ts
@@ -1,3 +1,3 @@
-import Id from '@/core/common/domain/value-objects/id'
+import { Id } from '@/core/common/domain/value-objects/id'
 
-export default class UserId extends Id {}
+export class UserId extends Id {}
diff --git a/src/core/common/utils/ignore.ts b/src/core/common/utils/ignore.ts
index b1e9cc0..efe9de9 100644
--- a/src/core/common/utils/ignore.ts
+++ b/src/core/common/utils/ignore.ts
@@ -4,4 +4,4 @@ const ignore = () => {
   return ok(undefined)
 }
 
-export default ignore
+export { ignore }
diff --git a/src/core/loan/domain/model/loan.entity.ts b/src/core/loan/domain/model/loan.entity.ts
index eebc9a1..7bd55de 100644
--- a/src/core/loan/domain/model/loan.entity.ts
+++ b/src/core/loan/domain/model/loan.entity.ts
@@ -1,9 +1,9 @@
-import AggregateRoot from '@/core/common/domain/model/aggregate-root'
-import BookId from '@/core/common/domain/value-objects/book-id'
-import LoanId from '@/core/common/domain/value-objects/loan-id'
-import UserId from '@/core/common/domain/value-objects/user-id'
+import { AggregateRoot } from '@/core/common/domain/model/aggregate-root'
+import { BookId } from '@/core/common/domain/value-objects/book-id'
+import { LoanId } from '@/core/common/domain/value-objects/loan-id'
+import { UserId } from '@/core/common/domain/value-objects/user-id'
 
-export default class Loan extends AggregateRoot {
+export class Loan extends AggregateRoot {
   constructor(
     private _id: LoanId,
     private _bookId: BookId,
diff --git a/src/core/loan/domain/model/loan.factory.ts b/src/core/loan/domain/model/loan.factory.ts
index 67cdfd8..a83ef1d 100644
--- a/src/core/loan/domain/model/loan.factory.ts
+++ b/src/core/loan/domain/model/loan.factory.ts
@@ -1,10 +1,10 @@
 import { ok, Result, safeTry } from 'neverthrow'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
-import BookId from '@/core/common/domain/value-objects/book-id'
-import LoanId from '@/core/common/domain/value-objects/loan-id'
-import UserId from '@/core/common/domain/value-objects/user-id'
-import Loan from '@/core/loan/domain/model/loan.entity'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { BookId } from '@/core/common/domain/value-objects/book-id'
+import { LoanId } from '@/core/common/domain/value-objects/loan-id'
+import { UserId } from '@/core/common/domain/value-objects/user-id'
+import { Loan } from '@/core/loan/domain/model/loan.entity'
 
 const LoanFactory = {
   create: (loan: {
@@ -29,4 +29,4 @@ const LoanFactory = {
     }),
 }
 
-export default LoanFactory
+export { LoanFactory }
diff --git a/src/core/loan/domain/services/loan-book.service.ts b/src/core/loan/domain/services/loan-book.service.ts
index 3c85dd0..4761daf 100644
--- a/src/core/loan/domain/services/loan-book.service.ts
+++ b/src/core/loan/domain/services/loan-book.service.ts
@@ -1,14 +1,14 @@
 import { ResultAsync } from 'neverthrow'
 
-import AvailableBook from '@/core/book/domain/model/available-book.entity'
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import DomainError from '@/core/common/domain/errors/domain-error'
-import LoanId from '@/core/common/domain/value-objects/loan-id'
-import UserId from '@/core/common/domain/value-objects/user-id'
-import LoanFactory from '@/core/loan/domain/model/loan.factory'
-import Loans from '@/core/loan/domain/services/loans.repository'
+import { AvailableBook } from '@/core/book/domain/model/available-book.entity'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { LoanId } from '@/core/common/domain/value-objects/loan-id'
+import { UserId } from '@/core/common/domain/value-objects/user-id'
+import { LoanFactory } from '@/core/loan/domain/model/loan.factory'
+import { Loans } from '@/core/loan/domain/services/loans.repository'
 
-export default class LoanBookService {
+export class LoanBookService {
   constructor(private readonly loans: Loans) {}
 
   with(
diff --git a/src/core/loan/domain/services/loans.repository.ts b/src/core/loan/domain/services/loans.repository.ts
index c8f4069..ab802b0 100644
--- a/src/core/loan/domain/services/loans.repository.ts
+++ b/src/core/loan/domain/services/loans.repository.ts
@@ -1,12 +1,12 @@
 import { ResultAsync } from 'neverthrow'
 
-import NotFoundError from '@/core/common/domain/errors/application/not-found-error'
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import BookId from '@/core/common/domain/value-objects/book-id'
-import LoanId from '@/core/common/domain/value-objects/loan-id'
-import Loan from '@/core/loan/domain/model/loan.entity'
+import { NotFoundError } from '@/core/common/domain/errors/application/not-found-error'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { BookId } from '@/core/common/domain/value-objects/book-id'
+import { LoanId } from '@/core/common/domain/value-objects/loan-id'
+import { Loan } from '@/core/loan/domain/model/loan.entity'
 
-export default interface Loans {
+export interface Loans {
   ofBook(bookId: BookId): ResultAsync<Loan, NotFoundError>
   remove(id: LoanId): ResultAsync<void, NotFoundError>
   save(loan: Loan): ResultAsync<void, ApplicationError>
diff --git a/src/core/loan/domain/services/return-book.service.ts b/src/core/loan/domain/services/return-book.service.ts
index e6e16bd..d00111a 100644
--- a/src/core/loan/domain/services/return-book.service.ts
+++ b/src/core/loan/domain/services/return-book.service.ts
@@ -1,11 +1,11 @@
 import { ResultAsync } from 'neverthrow'
 
-import LoanedBook from '@/core/book/domain/model/loaned-book.entity'
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import Loan from '@/core/loan/domain/model/loan.entity'
-import Loans from '@/core/loan/domain/services/loans.repository'
+import { LoanedBook } from '@/core/book/domain/model/loaned-book.entity'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { Loan } from '@/core/loan/domain/model/loan.entity'
+import { Loans } from '@/core/loan/domain/services/loans.repository'
 
-export default class ReturnBookService {
+export class ReturnBookService {
   constructor(private readonly loans: Loans) {}
 
   with(book: LoanedBook): ResultAsync<void, ApplicationError> {
diff --git a/src/core/loan/dto/responses/historical-loans.response.ts b/src/core/loan/dto/responses/historical-loans.response.ts
index 99197f9..025c5c0 100644
--- a/src/core/loan/dto/responses/historical-loans.response.ts
+++ b/src/core/loan/dto/responses/historical-loans.response.ts
@@ -1,7 +1,7 @@
 import { DeepReadonly } from 'ts-essentials'
 
-import LoanRegistryType from '@/core/loan/infrastructure/persistence/loan-registry.type'
-import gravatar from '@/lib/utils/gravatar'
+import { LoanRegistryType } from '@/core/loan/infrastructure/persistence/loan-registry.type'
+import { gravatar } from '@/lib/utils/gravatar'
 
 type HistoricalLoansResponse = DeepReadonly<{
   finishedAt: Date
@@ -29,4 +29,4 @@ const HistoricalLoansResponse = {
   },
 }
 
-export default HistoricalLoansResponse
+export { HistoricalLoansResponse }
diff --git a/src/core/loan/infrastructure/actions/get-historical-loans.ts b/src/core/loan/infrastructure/actions/get-historical-loans.ts
index a039ff5..4c7ba38 100644
--- a/src/core/loan/infrastructure/actions/get-historical-loans.ts
+++ b/src/core/loan/infrastructure/actions/get-historical-loans.ts
@@ -2,10 +2,10 @@
 
 import { unstable_cache as cache } from 'next/cache'
 
-import HistoricalLoansResponse from '@/core/loan/dto/responses/historical-loans.response'
-import container from '@/lib/container'
+import { HistoricalLoansResponse } from '@/core/loan/dto/responses/historical-loans.response'
+import { container } from '@/lib/container'
 
-export default async function getHistoricalLoans(
+export async function getHistoricalLoans(
   bookId: string,
 ): Promise<HistoricalLoansResponse[]> {
   const getCachedLoans = cache(
diff --git a/src/core/loan/infrastructure/actions/loan-actions.ts b/src/core/loan/infrastructure/actions/loan-actions.ts
index 75b4fb3..14593d8 100644
--- a/src/core/loan/infrastructure/actions/loan-actions.ts
+++ b/src/core/loan/infrastructure/actions/loan-actions.ts
@@ -3,11 +3,11 @@
 import { revalidateTag } from 'next/cache'
 import { z } from 'zod'
 
-import LoanBookRequest from '@/core/book/dto/requests/loan-book.request'
-import ReturnBookRequest from '@/core/book/dto/requests/return-book.request'
-import me from '@/core/user/infrastructure/actions/me'
-import container from '@/lib/container'
-import FormResponse from '@/lib/zod/form-response'
+import { LoanBookRequest } from '@/core/book/dto/requests/loan-book.request'
+import { ReturnBookRequest } from '@/core/book/dto/requests/return-book.request'
+import { me } from '@/core/user/infrastructure/actions/me'
+import { container } from '@/lib/container'
+import { FormResponse } from '@/lib/zod/form-response'
 
 export interface LoanActionForm {
   action: string
diff --git a/src/core/loan/infrastructure/persistence/loan-registry.type.ts b/src/core/loan/infrastructure/persistence/loan-registry.type.ts
index 81a5210..9decf19 100644
--- a/src/core/loan/infrastructure/persistence/loan-registry.type.ts
+++ b/src/core/loan/infrastructure/persistence/loan-registry.type.ts
@@ -1,7 +1,5 @@
 import { Prisma } from '@prisma/client'
 
-type LoanRegistryType = Prisma.LoanRegistryGetPayload<{
+export type LoanRegistryType = Prisma.LoanRegistryGetPayload<{
   include: { user: true }
 }>
-
-export default LoanRegistryType
diff --git a/src/core/loan/infrastructure/persistence/loan.data-mapper.ts b/src/core/loan/infrastructure/persistence/loan.data-mapper.ts
index 435ea70..eb0cb20 100644
--- a/src/core/loan/infrastructure/persistence/loan.data-mapper.ts
+++ b/src/core/loan/infrastructure/persistence/loan.data-mapper.ts
@@ -1,9 +1,9 @@
 import { Loan as PrismaLoan } from '@prisma/client'
 
-import BookId from '@/core/common/domain/value-objects/book-id'
-import LoanId from '@/core/common/domain/value-objects/loan-id'
-import UserId from '@/core/common/domain/value-objects/user-id'
-import Loan from '@/core/loan/domain/model/loan.entity'
+import { BookId } from '@/core/common/domain/value-objects/book-id'
+import { LoanId } from '@/core/common/domain/value-objects/loan-id'
+import { UserId } from '@/core/common/domain/value-objects/user-id'
+import { Loan } from '@/core/loan/domain/model/loan.entity'
 
 const LoanDataMapper = {
   toModel: (loan: PrismaLoan): Loan =>
@@ -23,4 +23,4 @@ const LoanDataMapper = {
   }),
 } as const
 
-export default LoanDataMapper
+export { LoanDataMapper }
diff --git a/src/core/loan/infrastructure/persistence/loan.publisher.ts b/src/core/loan/infrastructure/persistence/loan.publisher.ts
index 11baeed..c172045 100644
--- a/src/core/loan/infrastructure/persistence/loan.publisher.ts
+++ b/src/core/loan/infrastructure/persistence/loan.publisher.ts
@@ -1,13 +1,13 @@
 import { PrismaClient } from '@prisma/client'
 import { ResultAsync } from 'neverthrow'
 
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import Publisher from '@/core/common/domain/publisher/publisher'
-import ignore from '@/core/common/utils/ignore'
-import Loan from '@/core/loan/domain/model/loan.entity'
-import LoanDataMapper from '@/core/loan/infrastructure/persistence/loan.data-mapper'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { Publisher } from '@/core/common/domain/publisher/publisher'
+import { ignore } from '@/core/common/utils/ignore'
+import { Loan } from '@/core/loan/domain/model/loan.entity'
+import { LoanDataMapper } from '@/core/loan/infrastructure/persistence/loan.data-mapper'
 
-export default class LoanPublisher extends Publisher<Loan> {
+export class LoanPublisher extends Publisher<Loan> {
   constructor(private readonly prisma: PrismaClient) {
     super()
   }
diff --git a/src/core/loan/infrastructure/queries/get-historical-loans.query.ts b/src/core/loan/infrastructure/queries/get-historical-loans.query.ts
index 3d61c48..78c388a 100644
--- a/src/core/loan/infrastructure/queries/get-historical-loans.query.ts
+++ b/src/core/loan/infrastructure/queries/get-historical-loans.query.ts
@@ -1,11 +1,11 @@
 import { PrismaClient } from '@prisma/client'
 import { okAsync, ResultAsync } from 'neverthrow'
 
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import HistoricalLoansResponse from '@/core/loan/dto/responses/historical-loans.response'
-import LoanRegistryType from '@/core/loan/infrastructure/persistence/loan-registry.type'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { HistoricalLoansResponse } from '@/core/loan/dto/responses/historical-loans.response'
+import { LoanRegistryType } from '@/core/loan/infrastructure/persistence/loan-registry.type'
 
-export default class GetHistoricalLoansQuery {
+export class GetHistoricalLoansQuery {
   constructor(private readonly prisma: PrismaClient) {}
 
   with(
diff --git a/src/core/loan/infrastructure/services/loans-prisma.repository.ts b/src/core/loan/infrastructure/services/loans-prisma.repository.ts
index 0fe3106..9120b12 100644
--- a/src/core/loan/infrastructure/services/loans-prisma.repository.ts
+++ b/src/core/loan/infrastructure/services/loans-prisma.repository.ts
@@ -1,17 +1,17 @@
 import { Loan as LoanPrisma, PrismaClient } from '@prisma/client'
 import { okAsync, ResultAsync } from 'neverthrow'
 
-import NotFoundError from '@/core/common/domain/errors/application/not-found-error'
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import BookId from '@/core/common/domain/value-objects/book-id'
-import LoanId from '@/core/common/domain/value-objects/loan-id'
-import ignore from '@/core/common/utils/ignore'
-import Loan from '@/core/loan/domain/model/loan.entity'
-import Loans from '@/core/loan/domain/services/loans.repository'
-import LoanDataMapper from '@/core/loan/infrastructure/persistence/loan.data-mapper'
-import LoanPublisher from '@/core/loan/infrastructure/persistence/loan.publisher'
+import { NotFoundError } from '@/core/common/domain/errors/application/not-found-error'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { BookId } from '@/core/common/domain/value-objects/book-id'
+import { LoanId } from '@/core/common/domain/value-objects/loan-id'
+import { ignore } from '@/core/common/utils/ignore'
+import { Loan } from '@/core/loan/domain/model/loan.entity'
+import { Loans } from '@/core/loan/domain/services/loans.repository'
+import { LoanDataMapper } from '@/core/loan/infrastructure/persistence/loan.data-mapper'
+import { LoanPublisher } from '@/core/loan/infrastructure/persistence/loan.publisher'
 
-export default class LoansPrisma implements Loans {
+export class LoansPrisma implements Loans {
   private publisher: LoanPublisher
 
   constructor(private readonly prisma: PrismaClient) {
diff --git a/src/core/user/application/__tests__/enable-user.use-case.spec.ts b/src/core/user/application/__tests__/enable-user.use-case.spec.ts
index 8cd12ee..5d95791 100644
--- a/src/core/user/application/__tests__/enable-user.use-case.spec.ts
+++ b/src/core/user/application/__tests__/enable-user.use-case.spec.ts
@@ -1,11 +1,11 @@
 import { describe, expect, it } from 'vitest'
 
-import EnableUserRequest from '@/core/user/dto/requests/enable-user.request'
-import container from '@/lib/container'
-import prisma from '@/lib/prisma/prisma'
-import unexpected from '@/lib/utils/unexpected'
+import { EnableUserRequest } from '@/core/user/dto/requests/enable-user.request'
+import { container } from '@/lib/container'
+import { prisma } from '@/lib/prisma/prisma'
+import { unexpected } from '@/lib/utils/unexpected'
 import { createUser } from '@/tests/examples/factories'
-import UsersExamples from '@/tests/examples/users.examples'
+import { UsersExamples } from '@/tests/examples/users.examples'
 
 describe('EnableUserUseCase', () => {
   it('should enable a user', async () => {
diff --git a/src/core/user/application/__tests__/find-user.use-case.spec.ts b/src/core/user/application/__tests__/find-user.use-case.spec.ts
index 49df9e4..ec91a43 100644
--- a/src/core/user/application/__tests__/find-user.use-case.spec.ts
+++ b/src/core/user/application/__tests__/find-user.use-case.spec.ts
@@ -1,11 +1,11 @@
 import { describe, expect, it } from 'vitest'
 
-import NotFoundError from '@/core/common/domain/errors/application/not-found-error'
-import FindUserRequest from '@/core/user/dto/requests/find-user.request'
-import container from '@/lib/container'
-import unexpected from '@/lib/utils/unexpected'
+import { NotFoundError } from '@/core/common/domain/errors/application/not-found-error'
+import { FindUserRequest } from '@/core/user/dto/requests/find-user.request'
+import { container } from '@/lib/container'
+import { unexpected } from '@/lib/utils/unexpected'
 import { createUser } from '@/tests/examples/factories'
-import UsersExamples from '@/tests/examples/users.examples'
+import { UsersExamples } from '@/tests/examples/users.examples'
 
 describe('FindUserUseCase', () => {
   it('should find a user by email', async () => {
diff --git a/src/core/user/application/__tests__/update-user.use-case.spec.ts b/src/core/user/application/__tests__/update-user.use-case.spec.ts
index e1096af..8c73190 100644
--- a/src/core/user/application/__tests__/update-user.use-case.spec.ts
+++ b/src/core/user/application/__tests__/update-user.use-case.spec.ts
@@ -1,14 +1,14 @@
 import { describe, expect, it } from 'vitest'
 
-import NotFoundError from '@/core/common/domain/errors/application/not-found-error'
-import UpdateUserRequest from '@/core/user/dto/requests/update-user.request'
-import UserResponse from '@/core/user/dto/responses/user.response'
-import container from '@/lib/container'
-import prisma from '@/lib/prisma/prisma'
-import gravatar from '@/lib/utils/gravatar'
-import unexpected from '@/lib/utils/unexpected'
+import { NotFoundError } from '@/core/common/domain/errors/application/not-found-error'
+import { UpdateUserRequest } from '@/core/user/dto/requests/update-user.request'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
+import { container } from '@/lib/container'
+import { prisma } from '@/lib/prisma/prisma'
+import { gravatar } from '@/lib/utils/gravatar'
+import { unexpected } from '@/lib/utils/unexpected'
 import { createUser } from '@/tests/examples/factories'
-import UsersExamples from '@/tests/examples/users.examples'
+import { UsersExamples } from '@/tests/examples/users.examples'
 
 describe('UpdateUserUseCase', () => {
   it('should update user name by email', async () => {
diff --git a/src/core/user/application/enable-user.use-case.ts b/src/core/user/application/enable-user.use-case.ts
index 13f2356..ddee598 100644
--- a/src/core/user/application/enable-user.use-case.ts
+++ b/src/core/user/application/enable-user.use-case.ts
@@ -1,12 +1,12 @@
 import { ok } from 'neverthrow'
 
-import Email from '@/core/common/domain/value-objects/email'
-import Role from '@/core/common/domain/value-objects/role'
-import User from '@/core/user/domain/model/user.entity'
-import Users from '@/core/user/domain/services/users.repository'
-import EnableUserRequest from '@/core/user/dto/requests/enable-user.request'
+import { Email } from '@/core/common/domain/value-objects/email'
+import { Role } from '@/core/common/domain/value-objects/role'
+import { User } from '@/core/user/domain/model/user.entity'
+import { Users } from '@/core/user/domain/services/users.repository'
+import { EnableUserRequest } from '@/core/user/dto/requests/enable-user.request'
 
-export default class EnableUserUseCase {
+export class EnableUserUseCase {
   constructor(private readonly users: Users) {}
 
   async with(command: EnableUserRequest) {
diff --git a/src/core/user/application/find-user.use-case.ts b/src/core/user/application/find-user.use-case.ts
index 85bae94..e991154 100644
--- a/src/core/user/application/find-user.use-case.ts
+++ b/src/core/user/application/find-user.use-case.ts
@@ -1,13 +1,13 @@
 import { ok, Result } from 'neverthrow'
 
-import NotFoundError from '@/core/common/domain/errors/application/not-found-error'
-import DomainError from '@/core/common/domain/errors/domain-error'
-import Email from '@/core/common/domain/value-objects/email'
-import Users from '@/core/user/domain/services/users.repository'
-import FindUserRequest from '@/core/user/dto/requests/find-user.request'
-import UserResponse from '@/core/user/dto/responses/user.response'
+import { NotFoundError } from '@/core/common/domain/errors/application/not-found-error'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { Email } from '@/core/common/domain/value-objects/email'
+import { Users } from '@/core/user/domain/services/users.repository'
+import { FindUserRequest } from '@/core/user/dto/requests/find-user.request'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
 
-export default class FindUserUseCase {
+export class FindUserUseCase {
   constructor(private readonly users: Users) {}
 
   async with(
diff --git a/src/core/user/application/update-setting.use-case.ts b/src/core/user/application/update-setting.use-case.ts
index c7e9e2b..3d21a94 100644
--- a/src/core/user/application/update-setting.use-case.ts
+++ b/src/core/user/application/update-setting.use-case.ts
@@ -1,15 +1,15 @@
 import { err, ok, Result } from 'neverthrow'
 
-import NotFoundError from '@/core/common/domain/errors/application/not-found-error'
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import DomainError from '@/core/common/domain/errors/domain-error'
-import Email from '@/core/common/domain/value-objects/email'
-import FullName from '@/core/common/domain/value-objects/fullname'
-import User from '@/core/user/domain/model/user.entity'
-import Users from '@/core/user/domain/services/users.repository'
-import UpdateSettingRequest from '@/core/user/dto/requests/update-setting.request'
+import { NotFoundError } from '@/core/common/domain/errors/application/not-found-error'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { Email } from '@/core/common/domain/value-objects/email'
+import { FullName } from '@/core/common/domain/value-objects/fullname'
+import { User } from '@/core/user/domain/model/user.entity'
+import { Users } from '@/core/user/domain/services/users.repository'
+import { UpdateSettingRequest } from '@/core/user/dto/requests/update-setting.request'
 
-export default class UpdateSettingUseCase {
+export class UpdateSettingUseCase {
   constructor(private readonly users: Users) {}
 
   async with(
diff --git a/src/core/user/application/update-user.use-case.ts b/src/core/user/application/update-user.use-case.ts
index d41ca60..74047a2 100644
--- a/src/core/user/application/update-user.use-case.ts
+++ b/src/core/user/application/update-user.use-case.ts
@@ -1,14 +1,14 @@
 import { ok, Result } from 'neverthrow'
 
-import NotFoundError from '@/core/common/domain/errors/application/not-found-error'
-import DomainError from '@/core/common/domain/errors/domain-error'
-import Email from '@/core/common/domain/value-objects/email'
-import FullName from '@/core/common/domain/value-objects/fullname'
-import User from '@/core/user/domain/model/user.entity'
-import Users from '@/core/user/domain/services/users.repository'
-import UpdateUserRequest from '@/core/user/dto/requests/update-user.request'
+import { NotFoundError } from '@/core/common/domain/errors/application/not-found-error'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { Email } from '@/core/common/domain/value-objects/email'
+import { FullName } from '@/core/common/domain/value-objects/fullname'
+import { User } from '@/core/user/domain/model/user.entity'
+import { Users } from '@/core/user/domain/services/users.repository'
+import { UpdateUserRequest } from '@/core/user/dto/requests/update-user.request'
 
-export default class UpdateUserUseCase {
+export class UpdateUserUseCase {
   constructor(private readonly users: Users) {}
 
   async with(
diff --git a/src/core/user/domain/model/__tests__/user.spec.ts b/src/core/user/domain/model/__tests__/user.spec.ts
index c4201c3..7089a88 100644
--- a/src/core/user/domain/model/__tests__/user.spec.ts
+++ b/src/core/user/domain/model/__tests__/user.spec.ts
@@ -1,11 +1,11 @@
 import { ulid } from 'ulid'
 import { describe, expect, it } from 'vitest'
 
-import Role from '@/core/common/domain/value-objects/role'
-import UserFactory from '@/core/user/domain/model/user.factory'
-import UserResponse from '@/core/user/dto/responses/user.response'
-import gravatar from '@/lib/utils/gravatar'
-import unexpected from '@/lib/utils/unexpected'
+import { Role } from '@/core/common/domain/value-objects/role'
+import { UserFactory } from '@/core/user/domain/model/user.factory'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
+import { gravatar } from '@/lib/utils/gravatar'
+import { unexpected } from '@/lib/utils/unexpected'
 
 describe('User', () => {
   describe('create', () => {
diff --git a/src/core/user/domain/model/user.entity.ts b/src/core/user/domain/model/user.entity.ts
index 659cede..c8552ff 100644
--- a/src/core/user/domain/model/user.entity.ts
+++ b/src/core/user/domain/model/user.entity.ts
@@ -1,11 +1,11 @@
-import AggregateRoot from '@/core/common/domain/model/aggregate-root'
-import Email from '@/core/common/domain/value-objects/email'
-import FullName from '@/core/common/domain/value-objects/fullname'
-import Image from '@/core/common/domain/value-objects/image'
-import Roles from '@/core/common/domain/value-objects/roles'
-import UserId from '@/core/common/domain/value-objects/user-id'
-
-export default class User extends AggregateRoot {
+import { AggregateRoot } from '@/core/common/domain/model/aggregate-root'
+import { Email } from '@/core/common/domain/value-objects/email'
+import { FullName } from '@/core/common/domain/value-objects/fullname'
+import { Image } from '@/core/common/domain/value-objects/image'
+import { Roles } from '@/core/common/domain/value-objects/roles'
+import { UserId } from '@/core/common/domain/value-objects/user-id'
+
+export class User extends AggregateRoot {
   constructor(
     private _id: UserId,
     private _email: Email,
diff --git a/src/core/user/domain/model/user.factory.ts b/src/core/user/domain/model/user.factory.ts
index 59bcfe4..106db2a 100644
--- a/src/core/user/domain/model/user.factory.ts
+++ b/src/core/user/domain/model/user.factory.ts
@@ -1,15 +1,15 @@
 import { ok, Result, safeTry } from 'neverthrow'
 
-import DomainError from '@/core/common/domain/errors/domain-error'
-import Email from '@/core/common/domain/value-objects/email'
-import FullName from '@/core/common/domain/value-objects/fullname'
-import Image from '@/core/common/domain/value-objects/image'
-import Roles from '@/core/common/domain/value-objects/roles'
-import UserId from '@/core/common/domain/value-objects/user-id'
-import User from '@/core/user/domain/model/user.entity'
-import UserResponse from '@/core/user/dto/responses/user.response'
+import { DomainError } from '@/core/common/domain/errors/domain-error'
+import { Email } from '@/core/common/domain/value-objects/email'
+import { FullName } from '@/core/common/domain/value-objects/fullname'
+import { Image } from '@/core/common/domain/value-objects/image'
+import { Roles } from '@/core/common/domain/value-objects/roles'
+import { UserId } from '@/core/common/domain/value-objects/user-id'
+import { User } from '@/core/user/domain/model/user.entity'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
 
-const UserFactory = {
+export const UserFactory = {
   create: (userResponse: UserResponse): Result<User, DomainError> =>
     safeTry<User, DomainError>(function* () {
       const id = yield* UserId.create(userResponse.id)
@@ -31,5 +31,3 @@ const UserFactory = {
       return ok(new User(id, email, roles, name, image))
     }),
 }
-
-export default UserFactory
diff --git a/src/core/user/domain/services/users.repository.ts b/src/core/user/domain/services/users.repository.ts
index 028a474..3385201 100644
--- a/src/core/user/domain/services/users.repository.ts
+++ b/src/core/user/domain/services/users.repository.ts
@@ -1,11 +1,11 @@
 import { ResultAsync } from 'neverthrow'
 
-import NotFoundError from '@/core/common/domain/errors/application/not-found-error'
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import Email from '@/core/common/domain/value-objects/email'
-import User from '@/core/user/domain/model/user.entity'
+import { NotFoundError } from '@/core/common/domain/errors/application/not-found-error'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { Email } from '@/core/common/domain/value-objects/email'
+import { User } from '@/core/user/domain/model/user.entity'
 
-export default interface Users {
+export interface Users {
   findByEmail(email: Email): ResultAsync<User, NotFoundError>
   save(user: User): ResultAsync<void, ApplicationError>
 }
diff --git a/src/core/user/dto/requests/enable-user.request.ts b/src/core/user/dto/requests/enable-user.request.ts
index 6907ba1..dc22f0a 100644
--- a/src/core/user/dto/requests/enable-user.request.ts
+++ b/src/core/user/dto/requests/enable-user.request.ts
@@ -7,4 +7,4 @@ const EnableUserRequest = {
   with: (properties: EnableUserRequest) => properties,
 }
 
-export default EnableUserRequest
+export { EnableUserRequest }
diff --git a/src/core/user/dto/requests/find-user.request.ts b/src/core/user/dto/requests/find-user.request.ts
index 3473357..5df0c8a 100644
--- a/src/core/user/dto/requests/find-user.request.ts
+++ b/src/core/user/dto/requests/find-user.request.ts
@@ -8,4 +8,4 @@ const FindUserRequest = {
   with: (properties: FindUserRequest): FindUserRequest => properties,
 }
 
-export default FindUserRequest
+export { FindUserRequest }
diff --git a/src/core/user/dto/requests/update-setting.request.ts b/src/core/user/dto/requests/update-setting.request.ts
index 6a6c573..44ec87b 100644
--- a/src/core/user/dto/requests/update-setting.request.ts
+++ b/src/core/user/dto/requests/update-setting.request.ts
@@ -10,4 +10,4 @@ const UpdateSettingRequest = {
   with: (properties: UpdateSettingRequest): UpdateSettingRequest => properties,
 }
 
-export default UpdateSettingRequest
+export { UpdateSettingRequest }
diff --git a/src/core/user/dto/requests/update-user.request.ts b/src/core/user/dto/requests/update-user.request.ts
index bb09ff9..456d32a 100644
--- a/src/core/user/dto/requests/update-user.request.ts
+++ b/src/core/user/dto/requests/update-user.request.ts
@@ -10,4 +10,4 @@ const UpdateUserRequest = {
   with: (properties: UpdateUserRequest) => properties,
 }
 
-export default UpdateUserRequest
+export { UpdateUserRequest }
diff --git a/src/core/user/dto/responses/user.response.ts b/src/core/user/dto/responses/user.response.ts
index 5aeb8a6..21b930b 100644
--- a/src/core/user/dto/responses/user.response.ts
+++ b/src/core/user/dto/responses/user.response.ts
@@ -1,8 +1,8 @@
 import { DeepReadonly } from 'ts-essentials'
 
-import User from '@/core/user/domain/model/user.entity'
-import UserType from '@/core/user/infrastructure/persistence/user.type'
-import gravatar from '@/lib/utils/gravatar'
+import { User } from '@/core/user/domain/model/user.entity'
+import { UserType } from '@/core/user/infrastructure/persistence/user.type'
+import { gravatar } from '@/lib/utils/gravatar'
 
 type UserResponse = DeepReadonly<{
   email: string
@@ -30,4 +30,4 @@ const UserResponse = {
   with: (properties: UserResponse) => properties,
 }
 
-export default UserResponse
+export { UserResponse }
diff --git a/src/core/user/infrastructure/actions/enable-user.ts b/src/core/user/infrastructure/actions/enable-user.ts
index c42c9b6..fd8299d 100644
--- a/src/core/user/infrastructure/actions/enable-user.ts
+++ b/src/core/user/infrastructure/actions/enable-user.ts
@@ -2,11 +2,11 @@
 
 import { revalidateTag } from 'next/cache'
 
-import EnableUserRequest from '@/core/user/dto/requests/enable-user.request'
-import me from '@/core/user/infrastructure/actions/me'
-import container from '@/lib/container'
+import { EnableUserRequest } from '@/core/user/dto/requests/enable-user.request'
+import { me } from '@/core/user/infrastructure/actions/me'
+import { container } from '@/lib/container'
 
-export default async function enableUser(email: string, enable: boolean) {
+export async function enableUser(email: string, enable: boolean) {
   const user = await me()
 
   if (!user || !user.roles.includes('ROLE_ADMIN') || user.email === email) {
diff --git a/src/core/user/infrastructure/actions/find-user.ts b/src/core/user/infrastructure/actions/find-user.ts
index bf30c48..e38d0b5 100644
--- a/src/core/user/infrastructure/actions/find-user.ts
+++ b/src/core/user/infrastructure/actions/find-user.ts
@@ -1,8 +1,8 @@
 'use server'
 
-import FindUserRequest from '@/core/user/dto/requests/find-user.request'
-import UserResponse from '@/core/user/dto/responses/user.response'
-import container from '@/lib/container'
+import { FindUserRequest } from '@/core/user/dto/requests/find-user.request'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
+import { container } from '@/lib/container'
 
 export async function findUser(
   email: string,
diff --git a/src/core/user/infrastructure/actions/find-users.ts b/src/core/user/infrastructure/actions/find-users.ts
index a7482b6..eb5a233 100644
--- a/src/core/user/infrastructure/actions/find-users.ts
+++ b/src/core/user/infrastructure/actions/find-users.ts
@@ -1,8 +1,8 @@
 'use server'
 import { unstable_cache as cache } from 'next/cache'
 
-import UserResponse from '@/core/user/dto/responses/user.response'
-import container from '@/lib/container'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
+import { container } from '@/lib/container'
 
 export async function findUsers(): Promise<UserResponse[]> {
   const getCachedUsers = cache(
diff --git a/src/core/user/infrastructure/actions/me.ts b/src/core/user/infrastructure/actions/me.ts
index f9cd7cf..53ad006 100644
--- a/src/core/user/infrastructure/actions/me.ts
+++ b/src/core/user/infrastructure/actions/me.ts
@@ -1,11 +1,11 @@
 'use server'
 
-import FindUserRequest from '@/core/user/dto/requests/find-user.request'
-import UserResponse from '@/core/user/dto/responses/user.response'
+import { FindUserRequest } from '@/core/user/dto/requests/find-user.request'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
 import { auth } from '@/lib/auth/auth'
-import container from '@/lib/container'
+import { container } from '@/lib/container'
 
-export default async function me(): Promise<UserResponse | undefined> {
+export async function me(): Promise<UserResponse | undefined> {
   const session = await auth()
   const email = session?.user?.email as string
 
diff --git a/src/core/user/infrastructure/actions/update-setting.ts b/src/core/user/infrastructure/actions/update-setting.ts
index 1488ebc..170aa3e 100644
--- a/src/core/user/infrastructure/actions/update-setting.ts
+++ b/src/core/user/infrastructure/actions/update-setting.ts
@@ -3,10 +3,10 @@
 import { revalidateTag } from 'next/cache'
 import { z } from 'zod'
 
-import UpdateSettingRequest from '@/core/user/dto/requests/update-setting.request'
-import me from '@/core/user/infrastructure/actions/me'
-import container from '@/lib/container'
-import FormResponse from '@/lib/zod/form-response'
+import { UpdateSettingRequest } from '@/core/user/dto/requests/update-setting.request'
+import { me } from '@/core/user/infrastructure/actions/me'
+import { container } from '@/lib/container'
+import { FormResponse } from '@/lib/zod/form-response'
 
 export type UpdatableFields = 'name' | 'email'
 
diff --git a/src/core/user/infrastructure/actions/update-user.ts b/src/core/user/infrastructure/actions/update-user.ts
index 23c2ebb..f53f835 100644
--- a/src/core/user/infrastructure/actions/update-user.ts
+++ b/src/core/user/infrastructure/actions/update-user.ts
@@ -3,11 +3,11 @@
 import { revalidateTag } from 'next/cache'
 import { z } from 'zod'
 
-import UpdateUserRequest from '@/core/user/dto/requests/update-user.request'
+import { UpdateUserRequest } from '@/core/user/dto/requests/update-user.request'
 import { auth } from '@/lib/auth/auth'
-import container from '@/lib/container'
-import gravatar from '@/lib/utils/gravatar'
-import FormResponse from '@/lib/zod/form-response'
+import { container } from '@/lib/container'
+import { gravatar } from '@/lib/utils/gravatar'
+import { FormResponse } from '@/lib/zod/form-response'
 
 interface EditProfileForm {
   name: string
diff --git a/src/core/user/infrastructure/cli/add-user.cli.ts b/src/core/user/infrastructure/cli/add-user.cli.ts
index b05bcaa..7e29d38 100644
--- a/src/core/user/infrastructure/cli/add-user.cli.ts
+++ b/src/core/user/infrastructure/cli/add-user.cli.ts
@@ -3,9 +3,9 @@ import 'dotenv/config'
 
 import { ulid } from 'ulid'
 
-import UserDataMapper from '@/core/user/infrastructure/persistence/user.data-mapper'
-import prisma from '@/lib/prisma/prisma'
-import gravatar from '@/lib/utils/gravatar'
+import { UserDataMapper } from '@/core/user/infrastructure/persistence/user.data-mapper'
+import { prisma } from '@/lib/prisma/prisma'
+import { gravatar } from '@/lib/utils/gravatar'
 
 async function main() {
   if (
diff --git a/src/core/user/infrastructure/persistence/user.data-mapper.ts b/src/core/user/infrastructure/persistence/user.data-mapper.ts
index 2de04e5..4b41626 100644
--- a/src/core/user/infrastructure/persistence/user.data-mapper.ts
+++ b/src/core/user/infrastructure/persistence/user.data-mapper.ts
@@ -1,11 +1,11 @@
-import Email from '@/core/common/domain/value-objects/email'
-import FullName from '@/core/common/domain/value-objects/fullname'
-import Image from '@/core/common/domain/value-objects/image'
-import Role from '@/core/common/domain/value-objects/role'
-import Roles from '@/core/common/domain/value-objects/roles'
-import UserId from '@/core/common/domain/value-objects/user-id'
-import User from '@/core/user/domain/model/user.entity'
-import UserType from '@/core/user/infrastructure/persistence/user.type'
+import { Email } from '@/core/common/domain/value-objects/email'
+import { FullName } from '@/core/common/domain/value-objects/fullname'
+import { Image } from '@/core/common/domain/value-objects/image'
+import { Role } from '@/core/common/domain/value-objects/role'
+import { Roles } from '@/core/common/domain/value-objects/roles'
+import { UserId } from '@/core/common/domain/value-objects/user-id'
+import { User } from '@/core/user/domain/model/user.entity'
+import { UserType } from '@/core/user/infrastructure/persistence/user.type'
 
 const UserDataMapper = {
   toModel: (user: Omit<UserType, 'emailVerified'>): User =>
@@ -27,4 +27,4 @@ const UserDataMapper = {
   }),
 } as const
 
-export default UserDataMapper
+export { UserDataMapper }
diff --git a/src/core/user/infrastructure/persistence/user.publisher.ts b/src/core/user/infrastructure/persistence/user.publisher.ts
index 13bb2c2..f933b2e 100644
--- a/src/core/user/infrastructure/persistence/user.publisher.ts
+++ b/src/core/user/infrastructure/persistence/user.publisher.ts
@@ -1,13 +1,13 @@
 import { PrismaClient } from '@prisma/client'
 import { ResultAsync } from 'neverthrow'
 
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import Publisher from '@/core/common/domain/publisher/publisher'
-import ignore from '@/core/common/utils/ignore'
-import User from '@/core/user/domain/model/user.entity'
-import UserDataMapper from '@/core/user/infrastructure/persistence/user.data-mapper'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { Publisher } from '@/core/common/domain/publisher/publisher'
+import { ignore } from '@/core/common/utils/ignore'
+import { User } from '@/core/user/domain/model/user.entity'
+import { UserDataMapper } from '@/core/user/infrastructure/persistence/user.data-mapper'
 
-export default class UserPublisher extends Publisher<User> {
+export class UserPublisher extends Publisher<User> {
   constructor(private readonly prisma: PrismaClient) {
     super()
   }
diff --git a/src/core/user/infrastructure/persistence/user.type.ts b/src/core/user/infrastructure/persistence/user.type.ts
index f2fd0ec..3c71076 100644
--- a/src/core/user/infrastructure/persistence/user.type.ts
+++ b/src/core/user/infrastructure/persistence/user.type.ts
@@ -1,5 +1,3 @@
 import { Prisma } from '@prisma/client'
 
-type UserType = Prisma.UserGetPayload<true>
-
-export default UserType
+export type UserType = Prisma.UserGetPayload<true>
diff --git a/src/core/user/infrastructure/queries/find-all-users.query.ts b/src/core/user/infrastructure/queries/find-all-users.query.ts
index de5e877..2147cb9 100644
--- a/src/core/user/infrastructure/queries/find-all-users.query.ts
+++ b/src/core/user/infrastructure/queries/find-all-users.query.ts
@@ -1,11 +1,11 @@
 import { PrismaClient } from '@prisma/client'
 import { okAsync, ResultAsync } from 'neverthrow'
 
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import UserResponse from '@/core/user/dto/responses/user.response'
-import UserType from '@/core/user/infrastructure/persistence/user.type'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
+import { UserType } from '@/core/user/infrastructure/persistence/user.type'
 
-export default class FindAllUsersQuery {
+export class FindAllUsersQuery {
   constructor(private readonly prisma: PrismaClient) {}
 
   with(): ResultAsync<UserResponse[], ApplicationError> {
diff --git a/src/core/user/infrastructure/services/users-prisma.repository.ts b/src/core/user/infrastructure/services/users-prisma.repository.ts
index 69bcd00..73996f3 100644
--- a/src/core/user/infrastructure/services/users-prisma.repository.ts
+++ b/src/core/user/infrastructure/services/users-prisma.repository.ts
@@ -1,15 +1,15 @@
 import { PrismaClient } from '@prisma/client'
 import { okAsync, ResultAsync } from 'neverthrow'
 
-import NotFoundError from '@/core/common/domain/errors/application/not-found-error'
-import ApplicationError from '@/core/common/domain/errors/application-error'
-import Email from '@/core/common/domain/value-objects/email'
-import User from '@/core/user/domain/model/user.entity'
-import Users from '@/core/user/domain/services/users.repository'
-import UserDataMapper from '@/core/user/infrastructure/persistence/user.data-mapper'
-import UserPublisher from '@/core/user/infrastructure/persistence/user.publisher'
+import { NotFoundError } from '@/core/common/domain/errors/application/not-found-error'
+import { ApplicationError } from '@/core/common/domain/errors/application-error'
+import { Email } from '@/core/common/domain/value-objects/email'
+import { User } from '@/core/user/domain/model/user.entity'
+import { Users } from '@/core/user/domain/services/users.repository'
+import { UserDataMapper } from '@/core/user/infrastructure/persistence/user.data-mapper'
+import { UserPublisher } from '@/core/user/infrastructure/persistence/user.publisher'
 
-export default class UsersPrisma implements Users {
+export class UsersPrisma implements Users {
   private publisher: UserPublisher
 
   constructor(private readonly prisma: PrismaClient) {
diff --git a/src/lib/auth/auth.config.ts b/src/lib/auth/auth.config.ts
index 4555bd1..38912fa 100644
--- a/src/lib/auth/auth.config.ts
+++ b/src/lib/auth/auth.config.ts
@@ -1,10 +1,10 @@
 import { NextAuthFirewallConfig } from '@aulasoftwarelibre/next-auth-firewall'
 import { PrismaAdapter } from '@auth/prisma-adapter'
 
-import EmailProvider from '@/lib/auth/providers/email'
-import prisma from '@/lib/prisma/prisma'
+import { EmailProvider } from '@/lib/auth/providers/email.provider'
+import { prisma } from '@/lib/prisma/prisma'
 
-const authConfig = {
+export const authConfig = {
   accessControl: [
     {
       path: '^/admin',
@@ -46,5 +46,3 @@ const authConfig = {
     strategy: 'jwt',
   },
 } as NextAuthFirewallConfig
-
-export default authConfig
diff --git a/src/lib/auth/auth.ts b/src/lib/auth/auth.ts
index 235fd3c..c5c4379 100644
--- a/src/lib/auth/auth.ts
+++ b/src/lib/auth/auth.ts
@@ -1,6 +1,6 @@
 import NextAuthFirewall from '@aulasoftwarelibre/next-auth-firewall'
 
-import authConfig from '@/lib/auth/auth.config'
+import { authConfig } from '@/lib/auth/auth.config'
 
 export const {
   auth,
diff --git a/src/lib/auth/providers/email.ts b/src/lib/auth/providers/email.provider.ts
similarity index 96%
rename from src/lib/auth/providers/email.ts
rename to src/lib/auth/providers/email.provider.ts
index 87a358d..cdf7f3e 100644
--- a/src/lib/auth/providers/email.ts
+++ b/src/lib/auth/providers/email.provider.ts
@@ -1,7 +1,7 @@
 import { Provider } from '@auth/core/providers'
 import { EmailUserConfig } from '@auth/core/providers/email'
 
-export default function Email(
+export function EmailProvider(
   options: EmailUserConfig & Record<string, unknown>,
 ): Provider {
   return {
diff --git a/src/lib/container/container.ts b/src/lib/container/container.ts
index 99ff032..94cb8ef 100644
--- a/src/lib/container/container.ts
+++ b/src/lib/container/container.ts
@@ -1,21 +1,21 @@
-import CreateBookUseCase from '@/core/book/application/create-book.use-case'
-import EditBookUseCase from '@/core/book/application/edit-book.use-case'
-import LoanBookUseCase from '@/core/book/application/loan-book-use.case'
-import ReturnBookUseCase from '@/core/book/application/return-book.use-case'
-import FindAllBooksQuery from '@/core/book/infrastructure/queries/find-all-books.query'
-import FindBookQuery from '@/core/book/infrastructure/queries/find-book.query'
-import BooksPrisma from '@/core/book/infrastructure/services/books-prisma.repository'
-import LoanBookService from '@/core/loan/domain/services/loan-book.service'
-import ReturnBookService from '@/core/loan/domain/services/return-book.service'
-import GetHistoricalLoansQuery from '@/core/loan/infrastructure/queries/get-historical-loans.query'
-import LoansPrisma from '@/core/loan/infrastructure/services/loans-prisma.repository'
-import EnableUserUseCase from '@/core/user/application/enable-user.use-case'
-import FindUserUseCase from '@/core/user/application/find-user.use-case'
-import UpdateSettingUseCase from '@/core/user/application/update-setting.use-case'
-import UpdateUserUseCase from '@/core/user/application/update-user.use-case'
-import FindAllUsersQuery from '@/core/user/infrastructure/queries/find-all-users.query'
-import UsersPrisma from '@/core/user/infrastructure/services/users-prisma.repository'
-import prisma from '@/lib/prisma/prisma'
+import { CreateBookUseCase } from '@/core/book/application/create-book.use-case'
+import { EditBookUseCase } from '@/core/book/application/edit-book.use-case'
+import { LoanBookUseCase } from '@/core/book/application/loan-book-use.case'
+import { ReturnBookUseCase } from '@/core/book/application/return-book.use-case'
+import { FindAllBooksQuery } from '@/core/book/infrastructure/queries/find-all-books.query'
+import { FindBookQuery } from '@/core/book/infrastructure/queries/find-book.query'
+import { BooksPrisma } from '@/core/book/infrastructure/services/books-prisma.repository'
+import { LoanBookService } from '@/core/loan/domain/services/loan-book.service'
+import { ReturnBookService } from '@/core/loan/domain/services/return-book.service'
+import { GetHistoricalLoansQuery } from '@/core/loan/infrastructure/queries/get-historical-loans.query'
+import { LoansPrisma } from '@/core/loan/infrastructure/services/loans-prisma.repository'
+import { EnableUserUseCase } from '@/core/user/application/enable-user.use-case'
+import { FindUserUseCase } from '@/core/user/application/find-user.use-case'
+import { UpdateSettingUseCase } from '@/core/user/application/update-setting.use-case'
+import { UpdateUserUseCase } from '@/core/user/application/update-user.use-case'
+import { FindAllUsersQuery } from '@/core/user/infrastructure/queries/find-all-users.query'
+import { UsersPrisma } from '@/core/user/infrastructure/services/users-prisma.repository'
+import { prisma } from '@/lib/prisma/prisma'
 
 const Container = {
   init: () => {
@@ -42,4 +42,4 @@ const Container = {
   },
 }
 
-export default Container.init()
+export const container = Container.init()
diff --git a/src/lib/container/index.ts b/src/lib/container/index.ts
index 7eb6747..7caf7ed 100644
--- a/src/lib/container/index.ts
+++ b/src/lib/container/index.ts
@@ -1,12 +1,10 @@
-import Container from '@/lib/container/container'
+import { container as Container } from '@/lib/container/container'
 
 export const globalForContainer = global as unknown as {
   container: typeof Container
 }
 
-const container = globalForContainer.container || Container
+export const container = globalForContainer.container || Container
 
 if (process.env.NODE_ENV !== 'production')
   globalForContainer.container = container
-
-export default container
diff --git a/src/app/_components/theme-switcher/hooks.ts b/src/lib/hooks/use-theme.tsx
similarity index 59%
rename from src/app/_components/theme-switcher/hooks.ts
rename to src/lib/hooks/use-theme.tsx
index 009f3cb..1da29d3 100644
--- a/src/app/_components/theme-switcher/hooks.ts
+++ b/src/lib/hooks/use-theme.tsx
@@ -1,12 +1,13 @@
-import { useTheme } from 'next-themes'
+import { useTheme as useNextTheme } from 'next-themes'
 import { useEffect, useState } from 'react'
 
-export function useController() {
+export function useTheme() {
   const [mounted, setMounted] = useState(false)
-  const { setTheme, theme } = useTheme()
+  const { setTheme, theme } = useNextTheme()
 
   useEffect(() => {
     setMounted(true)
   }, [setMounted])
+
   return { mounted, setTheme, theme }
 }
diff --git a/src/lib/prisma/prisma.ts b/src/lib/prisma/prisma.ts
index d12387d..7dd607d 100644
--- a/src/lib/prisma/prisma.ts
+++ b/src/lib/prisma/prisma.ts
@@ -5,5 +5,3 @@ const globalForPrisma = global as unknown as { prisma: PrismaClient }
 export const prisma = globalForPrisma.prisma || new PrismaClient()
 
 if (process.env.NODE_ENV !== 'production') globalForPrisma.prisma = prisma
-
-export default prisma
diff --git a/src/lib/utils/gravatar.ts b/src/lib/utils/gravatar.ts
index 123ae7d..021914f 100644
--- a/src/lib/utils/gravatar.ts
+++ b/src/lib/utils/gravatar.ts
@@ -1,6 +1,6 @@
 import { createHash } from 'crypto'
 
-export default function gravatar(email: string | null) {
+export function gravatar(email: string | null) {
   if (!email) {
     return `http://www.gravatar.com/avatar`
   }
diff --git a/src/lib/utils/unexpected.ts b/src/lib/utils/unexpected.ts
index 34025f4..bfaed46 100644
--- a/src/lib/utils/unexpected.ts
+++ b/src/lib/utils/unexpected.ts
@@ -1,4 +1,4 @@
-const unexpected = {
+export const unexpected = {
   error: (cause: unknown) => {
     throw new Error(`Unexpected error, but got ${JSON.stringify(cause)}`)
   },
@@ -6,5 +6,3 @@ const unexpected = {
     throw new Error(`Expected an error, but got ${JSON.stringify(cause)}`)
   },
 }
-
-export default unexpected
diff --git a/src/lib/zod/form-response.ts b/src/lib/zod/form-response.ts
index d5d29ca..49a0735 100644
--- a/src/lib/zod/form-response.ts
+++ b/src/lib/zod/form-response.ts
@@ -47,4 +47,4 @@ const FormResponse = {
   }),
 }
 
-export default FormResponse
+export { FormResponse }
diff --git a/src/middleware.ts b/src/middleware.ts
index ba9aae0..6253ccf 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -1,8 +1,8 @@
 import NextAuthFirewall from '@aulasoftwarelibre/next-auth-firewall'
 
-import authConfig from '@/lib/auth/auth.config'
+import { authConfig } from '@/lib/auth/auth.config'
 
-export default NextAuthFirewall(authConfig).auth
+export const middleware = NextAuthFirewall(authConfig).auth
 
 export const config = {
   matcher: [
diff --git a/stories/components/auth-modal.stories.tsx b/stories/components/auth-modal.stories.tsx
index 5508b06..f2ac3a0 100644
--- a/stories/components/auth-modal.stories.tsx
+++ b/stories/components/auth-modal.stories.tsx
@@ -2,9 +2,9 @@ import { Kbd } from '@nextui-org/react'
 import { Meta, StoryObj } from '@storybook/react'
 import React from 'react'
 
-import AuthCard from '@/app/(auth)/_components/auth-card/auth-card'
-import AuthCardFooter from '@/app/(auth)/_components/auth-card/auth-card-footer'
-import AuthCardHeader from '@/app/(auth)/_components/auth-card/auth-card-header'
+import { AuthCard } from '@/app/(auth)/components/auth-card'
+import { AuthCardFooter } from '@/app/(auth)/components/auth-card-footer'
+import { AuthCardHeader } from '@/app/(auth)/components/auth-card-header'
 
 const meta = {
   component: AuthCard,
diff --git a/stories/components/book-breadcrumbs.stories.ts b/stories/components/book-breadcrumbs.stories.ts
index f0464a6..612242d 100644
--- a/stories/components/book-breadcrumbs.stories.ts
+++ b/stories/components/book-breadcrumbs.stories.ts
@@ -1,11 +1,11 @@
 import { Meta, StoryObj } from '@storybook/react'
 
-import BookBreadcrumbs from '@/app/books/_components/book-breadcrumbs/book-breadcrumbs'
+import { BookViewBreadcrumbs } from '@/app/books/components/book-view-breadcrumbs'
 
 const meta = {
-  component: BookBreadcrumbs,
+  component: BookViewBreadcrumbs,
   title: 'Components/BookBreadcrumbs',
-} satisfies Meta<typeof BookBreadcrumbs>
+} satisfies Meta<typeof BookViewBreadcrumbs>
 
 export default meta
 type Story = StoryObj<typeof meta>
diff --git a/stories/components/book-card.stories.ts b/stories/components/book-card.stories.ts
index 10695bf..3262df0 100644
--- a/stories/components/book-card.stories.ts
+++ b/stories/components/book-card.stories.ts
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react'
 
-import BookCard from '@/app/books/_components/book-card/book-card'
+import { BookCard } from '@/app/books/components/book-card'
 
 const meta = {
   component: BookCard,
diff --git a/stories/components/book-form.stories.ts b/stories/components/book-form.stories.ts
index 7f94901..026e4f9 100644
--- a/stories/components/book-form.stories.ts
+++ b/stories/components/book-form.stories.ts
@@ -1,11 +1,11 @@
 import { Meta, StoryObj } from '@storybook/react'
 
-import BookForm from '@/app/books/_components/book-form/book-form'
+import { BookViewForm } from '@/app/books/components/book-view-form'
 
 const meta = {
-  component: BookForm,
+  component: BookViewForm,
   title: 'Components/BookForm',
-} satisfies Meta<typeof BookForm>
+} satisfies Meta<typeof BookViewForm>
 
 export default meta
 type Story = StoryObj<typeof meta>
diff --git a/stories/components/settings-form-input-submit.stories.ts b/stories/components/settings-form-input-submit.stories.ts
index 02ce16e..3486b3e 100644
--- a/stories/components/settings-form-input-submit.stories.ts
+++ b/stories/components/settings-form-input-submit.stories.ts
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react'
 
-import SettingsFormInputSubmit from '@/app/settings/profile/_components/settings-form/settings-form-input-submit'
+import { SettingsFormInputSubmit } from '@/app/settings/components/settings-form-input-submit'
 
 const meta = {
   component: SettingsFormInputSubmit,
diff --git a/stories/components/settings-form-input-text.stories.tsx b/stories/components/settings-form-input-text.stories.tsx
index dbf681d..91d78ca 100644
--- a/stories/components/settings-form-input-text.stories.tsx
+++ b/stories/components/settings-form-input-text.stories.tsx
@@ -1,8 +1,8 @@
 import { Meta, StoryObj } from '@storybook/react'
 
-import SettingsForm from '@/app/settings/profile/_components/settings-form/settings-form'
-import SettingsFormInputText from '@/app/settings/profile/_components/settings-form/settings-form-input-text'
-import UserResponse from '@/core/user/dto/responses/user.response'
+import { SettingsForm } from '@/app/settings/components/settings-form'
+import { SettingsFormInputText } from '@/app/settings/components/settings-form-input-text'
+import { UserResponse } from '@/core/user/dto/responses/user.response'
 
 const meta = {
   component: SettingsFormInputText,
diff --git a/stories/components/settings-form.stories.tsx b/stories/components/settings-form.stories.tsx
index a4eac11..8a5aa73 100644
--- a/stories/components/settings-form.stories.tsx
+++ b/stories/components/settings-form.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react'
 
-import SettingsForm from '@/app/settings/profile/_components/settings-form/settings-form'
+import { SettingsForm } from '@/app/settings/components/settings-form'
 
 const meta = {
   component: SettingsForm,
diff --git a/stories/components/theme-switcher.stories.ts b/stories/components/theme-switcher.stories.ts
index e7d70f3..64e96d7 100644
--- a/stories/components/theme-switcher.stories.ts
+++ b/stories/components/theme-switcher.stories.ts
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react'
 
-import ThemeSwitcher from '@/app/_components/theme-switcher/theme-switcher'
+import { ThemeSwitcher } from '@/app/components/theme-switcher'
 
 const meta = {
   component: ThemeSwitcher,
diff --git a/stories/templates/settings-template.stories.tsx b/stories/templates/settings-template.stories.tsx
index da1b7ef..3c9fe58 100644
--- a/stories/templates/settings-template.stories.tsx
+++ b/stories/templates/settings-template.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from '@storybook/react'
 
-import SettingsTemplate from '@/app/settings/_components/settings-template/settings-template'
+import { SettingsTemplate } from '@/app/settings/components/settings-template'
 
 const meta = {
   component: SettingsTemplate,
diff --git a/tests/examples/books-request.examples.ts b/tests/examples/books-request.examples.ts
index 928886e..fefaa03 100644
--- a/tests/examples/books-request.examples.ts
+++ b/tests/examples/books-request.examples.ts
@@ -1,9 +1,9 @@
 import { ulid } from 'ulid'
 
-import CreateBookRequest from '@/core/book/dto/requests/create-book.request'
-import EditBookRequest from '@/core/book/dto/requests/edit-book.request'
+import { CreateBookRequest } from '@/core/book/dto/requests/create-book.request'
+import { EditBookRequest } from '@/core/book/dto/requests/edit-book.request'
 
-const bookRequestExamples = {
+export const bookRequestExamples = {
   create: () =>
     CreateBookRequest.with({
       authors: ['Jenny Doe', 'John Doe'],
@@ -19,5 +19,3 @@ const bookRequestExamples = {
       title: 'A book',
     }),
 }
-
-export default bookRequestExamples
diff --git a/tests/examples/books.examples.ts b/tests/examples/books.examples.ts
index 420e964..20dfd24 100644
--- a/tests/examples/books.examples.ts
+++ b/tests/examples/books.examples.ts
@@ -1,10 +1,10 @@
 import { ulid } from 'ulid'
 
 import { BookState } from '@/core/book/domain/model/book.entity'
-import BookDataMapper from '@/core/book/infrastructure/persistence/book.data-mapper'
-import gravatar from '@/lib/utils/gravatar'
+import { BookDataMapper } from '@/core/book/infrastructure/persistence/book.data-mapper'
+import { gravatar } from '@/lib/utils/gravatar'
 
-const BooksExamples = {
+export const BooksExamples = {
   available: () =>
     BookDataMapper.toAvailableBook({
       authors: ['Jane Doe'],
@@ -41,5 +41,3 @@ const BooksExamples = {
       version: 0,
     }),
 }
-
-export default BooksExamples
diff --git a/tests/examples/factories.ts b/tests/examples/factories.ts
index 69ee32f..fedc1b4 100644
--- a/tests/examples/factories.ts
+++ b/tests/examples/factories.ts
@@ -1,12 +1,12 @@
-import Book from '@/core/book/domain/model/book.entity'
-import BookDataMapper from '@/core/book/infrastructure/persistence/book.data-mapper'
-import LoanDataMapper from '@/core/loan/infrastructure/persistence/loan.data-mapper'
-import User from '@/core/user/domain/model/user.entity'
-import UserDataMapper from '@/core/user/infrastructure/persistence/user.data-mapper'
-import prisma from '@/lib/prisma/prisma'
-import BooksExamples from '@/tests/examples/books.examples'
-import LoansExamples from '@/tests/examples/loans.examples'
-import UsersExamples from '@/tests/examples/users.examples'
+import { Book } from '@/core/book/domain/model/book.entity'
+import { BookDataMapper } from '@/core/book/infrastructure/persistence/book.data-mapper'
+import { LoanDataMapper } from '@/core/loan/infrastructure/persistence/loan.data-mapper'
+import { User } from '@/core/user/domain/model/user.entity'
+import { UserDataMapper } from '@/core/user/infrastructure/persistence/user.data-mapper'
+import { prisma } from '@/lib/prisma/prisma'
+import { BooksExamples } from '@/tests/examples/books.examples'
+import { LoansExamples } from '@/tests/examples/loans.examples'
+import { UsersExamples } from '@/tests/examples/users.examples'
 
 export async function createAvailableBook() {
   const book = BooksExamples.available()
diff --git a/tests/examples/loans.examples.ts b/tests/examples/loans.examples.ts
index 15528aa..8c7ca53 100644
--- a/tests/examples/loans.examples.ts
+++ b/tests/examples/loans.examples.ts
@@ -1,10 +1,10 @@
 import { ulid } from 'ulid'
 
-import Book from '@/core/book/domain/model/book.entity'
-import LoanDataMapper from '@/core/loan/infrastructure/persistence/loan.data-mapper'
-import User from '@/core/user/domain/model/user.entity'
+import { Book } from '@/core/book/domain/model/book.entity'
+import { LoanDataMapper } from '@/core/loan/infrastructure/persistence/loan.data-mapper'
+import { User } from '@/core/user/domain/model/user.entity'
 
-const LoansExamples = {
+export const LoansExamples = {
   ofBookAndUser: (book: Book, user: User) =>
     LoanDataMapper.toModel({
       bookId: book.id.value,
@@ -14,5 +14,3 @@ const LoansExamples = {
       version: 0,
     }),
 }
-
-export default LoansExamples
diff --git a/tests/examples/users.examples.ts b/tests/examples/users.examples.ts
index e957662..4c73916 100644
--- a/tests/examples/users.examples.ts
+++ b/tests/examples/users.examples.ts
@@ -1,9 +1,9 @@
 import { ulid } from 'ulid'
 
-import UserDataMapper from '@/core/user/infrastructure/persistence/user.data-mapper'
-import gravatar from '@/lib/utils/gravatar'
+import { UserDataMapper } from '@/core/user/infrastructure/persistence/user.data-mapper'
+import { gravatar } from '@/lib/utils/gravatar'
 
-const UsersExamples = {
+export const UsersExamples = {
   basic: () =>
     UserDataMapper.toModel({
       email: 'test@example.com',
@@ -23,5 +23,3 @@ const UsersExamples = {
       version: 0,
     }),
 }
-
-export default UsersExamples
diff --git a/tests/setup.ts b/tests/setup.ts
index acf432f..75be1f2 100644
--- a/tests/setup.ts
+++ b/tests/setup.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeEach } from 'vitest'
 
-import prisma from '@/lib/prisma/prisma'
+import { prisma } from '@/lib/prisma/prisma'
 
 beforeEach(async () => {
   await prisma.$executeRaw`BEGIN`