diff --git a/src/app/[lang]/dashboard/components/client/create-random-invoice/create-random-invoice.tsx b/src/app/[lang]/dashboard/components/client/create-random-invoice/create-random-invoice.tsx
index 68742c2..8db5bf3 100644
--- a/src/app/[lang]/dashboard/components/client/create-random-invoice/create-random-invoice.tsx
+++ b/src/app/[lang]/dashboard/components/client/create-random-invoice/create-random-invoice.tsx
@@ -5,6 +5,9 @@ import CreateRandomInvoiceButtonVM from "@/app/[lang]/dashboard/vm/create-random
 import { useDI } from "@/bootstrap/di/di-context";
 import { useRef } from "react";
 
+/**
+ * From a parent component Vm and view will be connected together.
+ */
 export default function CreateRandomInvoiceContainer() {
   const di = useDI();
   const vm = useRef(di.resolve(CreateRandomInvoiceButtonVM));
diff --git a/src/app/[lang]/dashboard/components/client/nav-links/nav-link-vm.ts b/src/app/[lang]/dashboard/components/client/nav-links/nav-link.personal-vm.ts
similarity index 65%
rename from src/app/[lang]/dashboard/components/client/nav-links/nav-link-vm.ts
rename to src/app/[lang]/dashboard/components/client/nav-links/nav-link.personal-vm.ts
index bdf58b2..9ddf695 100644
--- a/src/app/[lang]/dashboard/components/client/nav-links/nav-link-vm.ts
+++ b/src/app/[lang]/dashboard/components/client/nav-links/nav-link.personal-vm.ts
@@ -2,17 +2,26 @@ import { DocumentIcon } from "@/app/components/icons/document";
 import HomeIcon from "@/app/components/icons/home";
 import { UserIcon } from "@/app/components/icons/user";
 import { usePathname } from "next/navigation";
+import { useRef } from "react";
 
 type LinkItem = {
   name: string;
   href: string;
   icon: (props: { className?: string }) => JSX.Element;
 };
+
+/**
+ * Beside of reusable vm each View can have it's own personal vm to handle it's ownlogics.
+ * Difference between personal vm and other vms which extends BaseVM, is that
+ * personal vm directly will be called inside of view and instinctly connected to the view,
+ *  so they come together always and there is no need to be connected with interface for reusable
+ *  vms.
+ */
 export default function navLinkPersonalVM() {
   const pathname = usePathname();
   // Map of links to display in the side navigation.
   // Depending on the size of the application, this would be stored in a database.
-  const links: LinkItem[] = [
+  const links = useRef<LinkItem[]>([
     { name: "Home", href: "/dashboard", icon: HomeIcon },
     {
       name: "Invoices",
@@ -20,7 +29,7 @@ export default function navLinkPersonalVM() {
       icon: DocumentIcon,
     },
     { name: "Customers", href: "/dashboard/customers", icon: UserIcon },
-  ];
+  ]).current;
   return {
     links,
     isLinkActive: (link: LinkItem) => pathname === link.href,
diff --git a/src/app/[lang]/dashboard/components/client/nav-links/nav-links.tsx b/src/app/[lang]/dashboard/components/client/nav-links/nav-links.tsx
index edb724c..8c2f587 100644
--- a/src/app/[lang]/dashboard/components/client/nav-links/nav-links.tsx
+++ b/src/app/[lang]/dashboard/components/client/nav-links/nav-links.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import navLinkPersonalVM from "@/app/[lang]/dashboard/components/client/nav-links/nav-link-vm";
+import navLinkPersonalVM from "@/app/[lang]/dashboard/components/client/nav-links/nav-link.personal-vm";
 import clsx from "clsx";
 import Link from "next/link";
 
diff --git a/src/app/[lang]/dashboard/components/client/theme-provider/theme-provider.tsx b/src/app/[lang]/dashboard/components/client/theme-provider/theme-provider.tsx
index 6a1ffe4..65b6bf4 100644
--- a/src/app/[lang]/dashboard/components/client/theme-provider/theme-provider.tsx
+++ b/src/app/[lang]/dashboard/components/client/theme-provider/theme-provider.tsx
@@ -1,11 +1,13 @@
-"use client"
+/* eslint-disable react/jsx-props-no-spreading */
 
-import * as React from "react"
-import { ThemeProvider as NextThemesProvider } from "next-themes"
+"use client";
+
+import * as React from "react";
+import { ThemeProvider as NextThemesProvider } from "next-themes";
 
 export function ThemeProvider({
   children,
   ...props
 }: React.ComponentProps<typeof NextThemesProvider>) {
-  return <NextThemesProvider {...props}>{children}</NextThemesProvider>
+  return <NextThemesProvider {...props}>{children}</NextThemesProvider>;
 }
diff --git a/src/app/[lang]/dashboard/components/server/card/card-controller.ts b/src/app/[lang]/dashboard/components/server/card/card.controller.ts
similarity index 84%
rename from src/app/[lang]/dashboard/components/server/card/card-controller.ts
rename to src/app/[lang]/dashboard/components/server/card/card.controller.ts
index 5f28e88..ddab125 100644
--- a/src/app/[lang]/dashboard/components/server/card/card-controller.ts
+++ b/src/app/[lang]/dashboard/components/server/card/card.controller.ts
@@ -5,6 +5,9 @@ import {
   InboxIcon,
 } from "@heroicons/react/24/outline";
 
+/**
+ * Controllers are bridge between feature layer and application layer.
+ */
 export default function cardController(props: {
   type: "invoices" | "customers" | "pending" | "collected";
 }) {
diff --git a/src/app/[lang]/dashboard/components/server/card/card.tsx b/src/app/[lang]/dashboard/components/server/card/card.tsx
index 0bb192a..9cf258b 100644
--- a/src/app/[lang]/dashboard/components/server/card/card.tsx
+++ b/src/app/[lang]/dashboard/components/server/card/card.tsx
@@ -1,4 +1,4 @@
-import cardController from "@/app/[lang]/dashboard/components/server/card/card-controller";
+import cardController from "@/app/[lang]/dashboard/components/server/card/card.controller";
 
 export function Card({
   title,
diff --git a/src/app/[lang]/dashboard/components/server/cards/cards-controller.ts b/src/app/[lang]/dashboard/components/server/cards/cards.controller.ts
similarity index 62%
rename from src/app/[lang]/dashboard/components/server/cards/cards-controller.ts
rename to src/app/[lang]/dashboard/components/server/cards/cards.controller.ts
index 9d38e29..a439eb8 100644
--- a/src/app/[lang]/dashboard/components/server/cards/cards-controller.ts
+++ b/src/app/[lang]/dashboard/components/server/cards/cards.controller.ts
@@ -1,6 +1,9 @@
-import fetchSummaryInfoUsecase from "@/feature/core/summary-info/domain/usecase/fetch-summary-info-usecase";
+import fetchSummaryInfoUsecase from "@/feature/core/summary-info/domain/usecase/fetch-summary-info.usecase";
 import { connection } from "next/server";
 
+/**
+ * Controllers are bridge between feature layer and application layer.
+ */
 export default function cardsController() {
   connection();
   return fetchSummaryInfoUsecase();
diff --git a/src/app/[lang]/dashboard/components/server/cards/cards.tsx b/src/app/[lang]/dashboard/components/server/cards/cards.tsx
index 91c641d..438c297 100644
--- a/src/app/[lang]/dashboard/components/server/cards/cards.tsx
+++ b/src/app/[lang]/dashboard/components/server/cards/cards.tsx
@@ -1,5 +1,5 @@
 import { Card } from "@/app/[lang]/dashboard/components/server/card/card";
-import cardsController from "@/app/[lang]/dashboard/components/server/cards/cards-controller";
+import cardsController from "@/app/[lang]/dashboard/components/server/cards/cards.controller";
 
 export default async function CardWrapper() {
   const { customersNumber, invoicesNumber, invoicesSummary } =
diff --git a/src/app/[lang]/dashboard/components/server/latest-invoices/latest-invoices-controller.ts b/src/app/[lang]/dashboard/components/server/latest-invoices/latest-invoices.controller.ts
similarity index 61%
rename from src/app/[lang]/dashboard/components/server/latest-invoices/latest-invoices-controller.ts
rename to src/app/[lang]/dashboard/components/server/latest-invoices/latest-invoices.controller.ts
index 2b7df56..b9b6a05 100644
--- a/src/app/[lang]/dashboard/components/server/latest-invoices/latest-invoices-controller.ts
+++ b/src/app/[lang]/dashboard/components/server/latest-invoices/latest-invoices.controller.ts
@@ -1,6 +1,9 @@
-import fetchCustomerInvoicesUsecase from "@/feature/core/customer-invoice/domain/usecase/fetch-customer-invoices-usecase";
+import fetchCustomerInvoicesUsecase from "@/feature/core/customer-invoice/domain/usecase/fetch-customer-invoices.usecase";
 import { connection } from "next/server";
 
+/**
+ * Controllers are bridge between feature layer and application layer.
+ */
 export default function latestInvoicesController() {
   connection();
   return fetchCustomerInvoicesUsecase();
diff --git a/src/app/[lang]/dashboard/components/server/latest-invoices/latest-invoices.tsx b/src/app/[lang]/dashboard/components/server/latest-invoices/latest-invoices.tsx
index e55a6e1..8afeae2 100644
--- a/src/app/[lang]/dashboard/components/server/latest-invoices/latest-invoices.tsx
+++ b/src/app/[lang]/dashboard/components/server/latest-invoices/latest-invoices.tsx
@@ -1,5 +1,5 @@
 import CreateRandomInvoiceContainer from "@/app/[lang]/dashboard/components/client/create-random-invoice/create-random-invoice";
-import latestInvoicesController from "@/app/[lang]/dashboard/components/server/latest-invoices/latest-invoices-controller";
+import latestInvoicesController from "@/app/[lang]/dashboard/components/server/latest-invoices/latest-invoices.controller";
 import { ArrowPathIcon } from "@heroicons/react/24/outline";
 import clsx from "clsx";
 import { isLeft } from "fp-ts/lib/Either";
diff --git a/src/app/[lang]/dashboard/components/server/revenue-chart/revenue-chart-controller.ts b/src/app/[lang]/dashboard/components/server/revenue-chart/revenue-chart.controller.ts
similarity index 87%
rename from src/app/[lang]/dashboard/components/server/revenue-chart/revenue-chart-controller.ts
rename to src/app/[lang]/dashboard/components/server/revenue-chart/revenue-chart.controller.ts
index 55c0797..2b811a1 100644
--- a/src/app/[lang]/dashboard/components/server/revenue-chart/revenue-chart-controller.ts
+++ b/src/app/[lang]/dashboard/components/server/revenue-chart/revenue-chart.controller.ts
@@ -1,6 +1,9 @@
-import Revenue from "@/feature/core/revenue/domain/entity/revenue";
-import fetchRevenuesUsecase from "@/feature/core/revenue/domain/usecase/fetch-revenues-usecase";
+import Revenue from "@/feature/core/revenue/domain/entity/revenue.entity";
+import fetchRevenuesUsecase from "@/feature/core/revenue/domain/usecase/fetch-revenues.usecase";
 
+/**
+ * Controllers are bridge between feature layer and application layer.
+ */
 export default async function revenueChartController() {
   const revenue = await fetchRevenuesUsecase();
   const chartHeight = 350;
diff --git a/src/app/[lang]/dashboard/components/server/revenue-chart/revenue-chart.tsx b/src/app/[lang]/dashboard/components/server/revenue-chart/revenue-chart.tsx
index e6bc5a0..2583c44 100644
--- a/src/app/[lang]/dashboard/components/server/revenue-chart/revenue-chart.tsx
+++ b/src/app/[lang]/dashboard/components/server/revenue-chart/revenue-chart.tsx
@@ -1,4 +1,4 @@
-import revenueChartController from "@/app/[lang]/dashboard/components/server/revenue-chart/revenue-chart-controller";
+import revenueChartController from "@/app/[lang]/dashboard/components/server/revenue-chart/revenue-chart.controller";
 import { CalendarIcon } from "@heroicons/react/24/outline";
 
 export default async function RevenueChart() {
diff --git a/src/app/[lang]/dashboard/layout.tsx b/src/app/[lang]/dashboard/layout.tsx
index 308e2a7..41a0efc 100644
--- a/src/app/[lang]/dashboard/layout.tsx
+++ b/src/app/[lang]/dashboard/layout.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import SideNav from "@/app/[lang]/dashboard/components/server/sidenav";
-import dashboardAppModule from "@/app/[lang]/dashboard/module/dashboard-app-module";
+import dashboardAppModule from "@/app/[lang]/dashboard/module/dashboard.app-module";
 import { DiContext } from "@/bootstrap/di/di-context";
 import { useRef } from "react";
 
diff --git a/src/app/[lang]/dashboard/module/dashboard-app-module.ts b/src/app/[lang]/dashboard/module/dashboard.app-module.ts
similarity index 81%
rename from src/app/[lang]/dashboard/module/dashboard-app-module.ts
rename to src/app/[lang]/dashboard/module/dashboard.app-module.ts
index 323a2f2..0f7e5e0 100644
--- a/src/app/[lang]/dashboard/module/dashboard-app-module.ts
+++ b/src/app/[lang]/dashboard/module/dashboard.app-module.ts
@@ -1,7 +1,10 @@
 import CreateRandomInvoiceButtonVM from "@/app/[lang]/dashboard/vm/create-random-invoice-button-vm";
 import di from "@/bootstrap/di/init-di";
-import createInvoiceUsecase from "@/feature/core/invoice/domain/usecase/create-invoice-usecase";
+import createInvoiceUsecase from "@/feature/core/invoice/domain/usecase/create-invoice.usecase";
 
+/**
+ * Each page can have its own di to connect all vms, usecases or controllers
+ */
 export default function dashboardAppModule() {
   const dashboardDi = di.createChildContainer();
 
diff --git a/src/app/[lang]/dashboard/vm/create-random-invoice-button-vm.ts b/src/app/[lang]/dashboard/vm/create-random-invoice-button-vm.ts
index 44abdcb..3ee3c1f 100644
--- a/src/app/[lang]/dashboard/vm/create-random-invoice-button-vm.ts
+++ b/src/app/[lang]/dashboard/vm/create-random-invoice-button-vm.ts
@@ -1,14 +1,19 @@
-import ButtonVm from "@/app/components/button/button-vm";
+import ButtonVm from "@/app/components/button/button.i-vm";
 import { useServerAction } from "@/bootstrap/helpers/hooks/use-server-action";
 import useThrottle from "@/bootstrap/helpers/hooks/use-throttle";
 import BaseVM from "@/bootstrap/helpers/vm/base-vm";
 import langKey from "@/bootstrap/i18n/dictionaries/lang-key";
-import { InvoiceParam } from "@/feature/core/invoice/domain/param/invoice-param";
-import createInvoiceUsecase from "@/feature/core/invoice/domain/usecase/create-invoice-usecase";
+import { InvoiceParam } from "@/feature/core/invoice/domain/param/invoice.param";
+import createInvoiceUsecase from "@/feature/core/invoice/domain/usecase/create-invoice.usecase";
 import { faker } from "@faker-js/faker";
 import { useRouter } from "next/navigation";
 import { useTranslation } from "react-i18next";
 
+/**
+ * Viewmodel for the button view to connect to business logics and all UI logics
+ * For UI logics, all translations, states, sideeffects and events will be handled
+ *  in this layer.
+ */
 export default class CreateRandomInvoiceButtonVM extends BaseVM<ButtonVm> {
   private createInvoice: typeof createInvoiceUsecase;
 
diff --git a/src/app/[lang]/layout.tsx b/src/app/[lang]/layout.tsx
index 89037c1..fd59033 100644
--- a/src/app/[lang]/layout.tsx
+++ b/src/app/[lang]/layout.tsx
@@ -1,5 +1,5 @@
 import { ThemeProvider } from "@/app/[lang]/dashboard/components/client/theme-provider/theme-provider";
-import { initI18next, LANGS } from "@/bootstrap/i18n/i18n";
+import { getI18n, LANGS } from "@/bootstrap/i18n/i18n";
 import TranslationsProvider from "@/bootstrap/i18n/i18n-provider";
 import localFont from "next/font/local";
 import { PropsWithChildren } from "react";
@@ -20,7 +20,7 @@ export default async function layout(
 ) {
   const { params, children } = props;
   const { lang } = await params;
-  const { resources } = await initI18next({ lng: lang });
+  const { resources } = await getI18n({ lng: lang });
   return (
     <html lang={lang} suppressHydrationWarning>
       <body
diff --git a/src/app/components/button/button-vm.ts b/src/app/components/button/button-vm.ts
deleted file mode 100644
index fa23606..0000000
--- a/src/app/components/button/button-vm.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export default interface ButtonVm {
-  props: {
-    title: string;
-    isDisable: boolean;
-  };
-  onClick(): void;
-}
diff --git a/src/app/components/button/button.i-vm.ts b/src/app/components/button/button.i-vm.ts
new file mode 100644
index 0000000..6d31344
--- /dev/null
+++ b/src/app/components/button/button.i-vm.ts
@@ -0,0 +1,11 @@
+/**
+ * Interface for viewmodel of button. this is bridge between view and viewmodel.
+ * With this interface, view is adapter and vms will be implementations in bridge pattern
+ */
+export default interface ButtonVm {
+  props: {
+    title: string;
+    isDisable: boolean;
+  };
+  onClick(): void;
+}
diff --git a/src/app/components/button/button.tsx b/src/app/components/button/button.tsx
index 2c72f27..4cf3a5b 100644
--- a/src/app/components/button/button.tsx
+++ b/src/app/components/button/button.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import BaseView, { BuildProps } from "@/bootstrap/helpers/view/base-view";
-import ButtonVm from "@/app/components/button/button-vm";
+import ButtonVm from "@/app/components/button/button.i-vm";
 import { ReactNode } from "react";
 import * as React from "react";
 import { Slot } from "@radix-ui/react-slot";
diff --git a/src/app/components/button/stories/Button.stories.tsx b/src/app/components/button/stories/Button.stories.tsx
index d7739ae..2ad8208 100644
--- a/src/app/components/button/stories/Button.stories.tsx
+++ b/src/app/components/button/stories/Button.stories.tsx
@@ -4,7 +4,7 @@ import { DiContext, useDI } from "@/bootstrap/di/di-context";
 import mockedModuleDi from "@/bootstrap/di/mocked-module-di";
 import Story from "@/bootstrap/helpers/view/storybook-base-template-type";
 import getArgVM from "@/bootstrap/helpers/view/storybook-with-arg-vm";
-import createInvoiceUsecase from "@/feature/core/invoice/domain/usecase/create-invoice-usecase";
+import createInvoiceUsecase from "@/feature/core/invoice/domain/usecase/create-invoice.usecase";
 import type { Meta } from "@storybook/react";
 import { useRef } from "react";
 
diff --git a/src/bootstrap/helpers/global-helpers.ts b/src/bootstrap/helpers/global-helpers.ts
index ca009a2..3548364 100644
--- a/src/bootstrap/helpers/global-helpers.ts
+++ b/src/bootstrap/helpers/global-helpers.ts
@@ -2,6 +2,9 @@ import { constructor } from "tsyringe/dist/typings/types";
 
 export const isServer = typeof window === "undefined";
 
+/**
+ * Checks if the given value is a class
+ */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function isClass(fn: any): fn is constructor<unknown> {
   return typeof fn === "function" && /^(class|function [A-Z])/.test(fn);
diff --git a/src/bootstrap/helpers/lib/ui-utils.ts b/src/bootstrap/helpers/lib/ui-utils.ts
index a5ef193..f8373a9 100644
--- a/src/bootstrap/helpers/lib/ui-utils.ts
+++ b/src/bootstrap/helpers/lib/ui-utils.ts
@@ -1,6 +1,10 @@
 import { clsx, type ClassValue } from "clsx";
 import { twMerge } from "tailwind-merge";
 
+/**
+ * To connect tailwind classes.
+ * @param inputs Tailwind classes
+ */
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs));
 }
diff --git a/src/bootstrap/helpers/view/base-view.tsx b/src/bootstrap/helpers/view/base-view.tsx
index b0d4f57..914c9fc 100644
--- a/src/bootstrap/helpers/view/base-view.tsx
+++ b/src/bootstrap/helpers/view/base-view.tsx
@@ -66,6 +66,11 @@ export type BuildProps<
   children?: ReactNode;
 };
 
+/**
+ * Base view is base component for all views in mvvm architecture which gets
+ *  vm as props and connect it to the view and memoize the component by default
+ *  to just render just on changes of its vm.
+ */
 export default abstract class BaseView<
   IVM extends IVMParent,
   PROPS extends IPropParent = undefined,
diff --git a/src/bootstrap/helpers/view/storybook-with-arg-vm.ts b/src/bootstrap/helpers/view/storybook-with-arg-vm.ts
index 210e173..7a3387c 100644
--- a/src/bootstrap/helpers/view/storybook-with-arg-vm.ts
+++ b/src/bootstrap/helpers/view/storybook-with-arg-vm.ts
@@ -1,5 +1,12 @@
 import IBaseVM from "@/bootstrap/helpers/vm/i-base-vm";
 
+/**
+ * To use with mvvm library to make a vm based on props so you can pass the result to the view
+ * @param vmObj All properties which view needs to get from vm.
+ * @returns Vm which is suitable to be passed to the view
+ * @example     const vm = getArgVM(globalData.parsedProps.vm); 
+    return <Button vm={vm} memoizedByVM={false} />;
+ */
 const getArgVM = <IVM>(vmObj: IVM) => {
   class VM implements IBaseVM<IVM> {
     useVM(): IVM {
diff --git a/src/bootstrap/helpers/vm/base-vm.ts b/src/bootstrap/helpers/vm/base-vm.ts
index 003443c..d3b02c4 100644
--- a/src/bootstrap/helpers/vm/base-vm.ts
+++ b/src/bootstrap/helpers/vm/base-vm.ts
@@ -5,6 +5,12 @@ import { NoOverride } from "@/bootstrap/helpers/type-helper";
 import IBaseVM from "@/bootstrap/helpers/vm/i-base-vm";
 import { useState } from "react";
 
+/**
+ * Base class for all viewmodels. It provides
+ *  - dependency injection: To get closes di which serves from di provider
+ *  - rerender method: to rerender your component manually
+ *  - produce method: to produce your vm dynamically by passing and attaching dependencies to it
+ */
 export default abstract class BaseVM<
   IVM,
   DEP extends object | undefined = undefined,
diff --git a/src/bootstrap/helpers/vm/i-base-vm.ts b/src/bootstrap/helpers/vm/i-base-vm.ts
index 0e474fa..e2530bd 100644
--- a/src/bootstrap/helpers/vm/i-base-vm.ts
+++ b/src/bootstrap/helpers/vm/i-base-vm.ts
@@ -1,3 +1,6 @@
+/**
+ * All viewmodels should implement this interface.
+ */
 export default interface IBaseVM<VM> {
   useVM(): VM;
 }
diff --git a/src/bootstrap/i18n/dictionaries/lang-key.ts b/src/bootstrap/i18n/dictionaries/lang-key.ts
index 1bc2143..9a1d7aa 100644
--- a/src/bootstrap/i18n/dictionaries/lang-key.ts
+++ b/src/bootstrap/i18n/dictionaries/lang-key.ts
@@ -1,3 +1,8 @@
+/**
+ * main language keys which will be used for translation to avoid using strings directly and be
+ *  a single source of truth in all changes between all languages dictionaries.
+ * All languages dictionaries should have the same keys by having this object type.
+ */
 const langKey = {
   global: {
     home: "global.home",
diff --git a/src/bootstrap/i18n/i18n-provider.tsx b/src/bootstrap/i18n/i18n-provider.tsx
index ed50a29..8b3ab16 100644
--- a/src/bootstrap/i18n/i18n-provider.tsx
+++ b/src/bootstrap/i18n/i18n-provider.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { I18nextProvider } from "react-i18next";
-import { i18nInstance, initI18next, LANGS } from "@/bootstrap/i18n/i18n";
+import { i18nInstance, getI18n, LANGS } from "@/bootstrap/i18n/i18n";
 import { Resource } from "i18next";
 import { PropsWithChildren } from "react";
 
@@ -11,7 +11,7 @@ export default function TranslationsProvider({
   resources,
 }: PropsWithChildren & { lng: LANGS; resources: Resource }) {
   if (!resources) return children;
-  initI18next({ lng, resources });
+  getI18n({ lng, resources });
 
   return <I18nextProvider i18n={i18nInstance}>{children}</I18nextProvider>;
 }
diff --git a/src/feature/common/data/api-task.ts b/src/feature/common/data/api-task.ts
index 2f85177..ba1692a 100644
--- a/src/feature/common/data/api-task.ts
+++ b/src/feature/common/data/api-task.ts
@@ -1,6 +1,6 @@
 import { Either } from "fp-ts/lib/Either";
 import { TaskEither } from "fp-ts/lib/TaskEither";
-import BaseFailure from "@/feature/common/failures/base-failure";
+import BaseFailure from "@/feature/common/failures/base.failure";
 
 type ApiTask<ResponseType> = TaskEither<BaseFailure<unknown>, ResponseType>;
 export type ApiEither<ResponseType> = Either<
diff --git a/src/feature/common/failures/base-failure.ts b/src/feature/common/failures/base.failure.ts
similarity index 60%
rename from src/feature/common/failures/base-failure.ts
rename to src/feature/common/failures/base.failure.ts
index 2719351..3acb88c 100644
--- a/src/feature/common/failures/base-failure.ts
+++ b/src/feature/common/failures/base.failure.ts
@@ -1,8 +1,14 @@
 import { makeFailureMessage } from "@/feature/common/failures/failure-helpers";
 
 /**
- * This is a class called  BaseFailure  that extends the  Error  class. It is
- *  used as a base class for creating custom failure classes.
+ * This class can be used as a base class for creating custom failure classes.
+ * With this class you can set message and metadata, with messages and extending
+ *  you can create your failure messages hierarchy and automatically by syncing langKey
+ *  with the hirerarchy of failure messages.
+ * For example if you pass a key of `user` to the constructor of `UserCreationFailure`
+ *  so in langKey you can have failure message `faiure.user` so automatically,
+ *  you can show translated error message everywhere in the app.
+ * Also you can use this failure message to have grained control over failures.
  */
 export default abstract class BaseFailure<META_DATA> {
   /* ------------------------------- Attributes ------------------------------- */
diff --git a/src/feature/common/failures/dev/arguments-failure.ts b/src/feature/common/failures/dev/arguments.failure.ts
similarity index 97%
rename from src/feature/common/failures/dev/arguments-failure.ts
rename to src/feature/common/failures/dev/arguments.failure.ts
index 6e0d266..2e10664 100644
--- a/src/feature/common/failures/dev/arguments-failure.ts
+++ b/src/feature/common/failures/dev/arguments.failure.ts
@@ -1,4 +1,4 @@
-import BaseDevFailure from "@/feature/common/failures/dev/base-dev-failure";
+import BaseDevFailure from "@/feature/common/failures/dev/base-dev.failure";
 
 /**
  * Failure for needed arguments in a method but sent wrong one
diff --git a/src/feature/common/failures/dev/base-dev-failure.ts b/src/feature/common/failures/dev/base-dev-failure.ts
deleted file mode 100644
index 94bea0c..0000000
--- a/src/feature/common/failures/dev/base-dev-failure.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import BaseFailure from "@/feature/common/failures/base-failure";
-
-export default abstract class BaseDevFailure<
-  META_DATA,
-> extends BaseFailure<META_DATA> {}
diff --git a/src/feature/common/failures/dev/base-dev.failure.ts b/src/feature/common/failures/dev/base-dev.failure.ts
new file mode 100644
index 0000000..c6f13c4
--- /dev/null
+++ b/src/feature/common/failures/dev/base-dev.failure.ts
@@ -0,0 +1,10 @@
+import BaseFailure from "@/feature/common/failures/base.failure";
+
+/**
+ * This is a base class for development failures. All dev failures means we as a developer
+ *  made a mistake in the process and we should fix it and can be used in monitoring and
+ *  should be handled in hotfix ASAP.
+ */
+export default abstract class BaseDevFailure<
+  META_DATA,
+> extends BaseFailure<META_DATA> {}
diff --git a/src/feature/common/failures/dev/dependency-failure.ts b/src/feature/common/failures/dev/dependency.failure.ts
similarity index 76%
rename from src/feature/common/failures/dev/dependency-failure.ts
rename to src/feature/common/failures/dev/dependency.failure.ts
index 5b81b13..2b1f2ec 100644
--- a/src/feature/common/failures/dev/dependency-failure.ts
+++ b/src/feature/common/failures/dev/dependency.failure.ts
@@ -1,7 +1,7 @@
-import BaseDevFailure from "@/feature/common/failures/dev/base-dev-failure";
+import BaseDevFailure from "@/feature/common/failures/dev/base-dev.failure";
 
 /**
- * This is a failure of not having specific dependency
+ * This is a failure when we didn't provice specific dependency.
  */
 export default class DependencyFailure<
   META_DATA,
diff --git a/src/feature/common/failures/failure-helpers.ts b/src/feature/common/failures/failure-helpers.ts
index 673b8aa..c1760f4 100644
--- a/src/feature/common/failures/failure-helpers.ts
+++ b/src/feature/common/failures/failure-helpers.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import BaseFailure from "@/feature/common/failures/base-failure";
+import BaseFailure from "@/feature/common/failures/base.failure";
 
 /**
  * This method is supposed to save previous failure of TaskEither
diff --git a/src/feature/common/failures/network-failure.ts b/src/feature/common/failures/network.failure.ts
similarity index 90%
rename from src/feature/common/failures/network-failure.ts
rename to src/feature/common/failures/network.failure.ts
index 192bdf5..37b04df 100644
--- a/src/feature/common/failures/network-failure.ts
+++ b/src/feature/common/failures/network.failure.ts
@@ -1,4 +1,4 @@
-import BaseFailure from "./base-failure";
+import BaseFailure from "./base.failure";
 
 /**
  * Failure for HTTP response when response dosn't have base structure
diff --git a/src/feature/common/failures/params-failure.ts b/src/feature/common/failures/params.failure.ts
similarity index 72%
rename from src/feature/common/failures/params-failure.ts
rename to src/feature/common/failures/params.failure.ts
index 67f8cb9..3d04e57 100644
--- a/src/feature/common/failures/params-failure.ts
+++ b/src/feature/common/failures/params.failure.ts
@@ -1,7 +1,7 @@
-import BaseFailure from "./base-failure";
+import BaseFailure from "./base.failure";
 
 /**
- * Failure for params failure
+ * Failure for params failure. which means some params are missing or not valid
  */
 export default class ParamsFailure<META_DATA> extends BaseFailure<META_DATA> {
   /* ------------------------------- Constructor ------------------------------ */
diff --git a/src/feature/common/server-di.ts b/src/feature/common/server.di.ts
similarity index 87%
rename from src/feature/common/server-di.ts
rename to src/feature/common/server.di.ts
index 71ddbfa..37c4ad1 100644
--- a/src/feature/common/server-di.ts
+++ b/src/feature/common/server.di.ts
@@ -1,14 +1,14 @@
-import getCustomerInvoiceDi from "@/feature/core/customer-invoice/data/module/customer-invoice-di";
-import { customerInvoiceModuleKey } from "@/feature/core/customer-invoice/invoice-module-key";
+import getCustomerInvoiceDi from "@/feature/core/customer-invoice/data/module/customer-invoice.di";
+import { customerInvoiceModuleKey } from "@/feature/core/customer-invoice/invoice.module-key";
 import { customerKey } from "@/feature/core/customer/customer-key";
 import getCustomerDi from "@/feature/core/customer/data/module/customer-di";
-import getInvoiceDi from "@/feature/core/invoice/data/module/invoice-di";
-import { invoiceModuleKey } from "@/feature/core/invoice/invoice-module-key";
+import getInvoiceDi from "@/feature/core/invoice/data/module/invoice.di";
+import { invoiceModuleKey } from "@/feature/core/invoice/invoice.module-key";
 import { DependencyContainer } from "tsyringe";
-import { summaryInfoModuleKey } from "@/feature/core/summary-info/domain/summary-info-module-key";
-import getSummaryInfoDi from "@/feature/core/summary-info/data/module/summary-info-di";
-import { revenueModuleKey } from "@/feature/core/revenue/domain/revenue-module-key";
-import getRevenueDi from "@/feature/core/revenue/data/module/revenue-di";
+import { summaryInfoModuleKey } from "@/feature/core/summary-info/domain/summary-info.module-key";
+import getSummaryInfoDi from "@/feature/core/summary-info/data/module/summary-info.di";
+import { revenueModuleKey } from "@/feature/core/revenue/domain/revenue.module-key";
+import getRevenueDi from "@/feature/core/revenue/data/module/revenue.di";
 
 const memoizedDis: Record<string, DependencyContainer> = {};
 
diff --git a/src/feature/core/customer-invoice/data/module/customer-invoice-di.ts b/src/feature/core/customer-invoice/data/module/customer-invoice.di.ts
similarity index 83%
rename from src/feature/core/customer-invoice/data/module/customer-invoice-di.ts
rename to src/feature/core/customer-invoice/data/module/customer-invoice.di.ts
index e470b22..527b37e 100644
--- a/src/feature/core/customer-invoice/data/module/customer-invoice-di.ts
+++ b/src/feature/core/customer-invoice/data/module/customer-invoice.di.ts
@@ -1,6 +1,6 @@
 import di from "@/bootstrap/di/init-di";
-import CustomerInvoiceDbRepo from "@/feature/core/customer-invoice/data/repo/customer-invoice-db-repo";
-import { customerInvoiceRepoKey } from "@/feature/core/customer-invoice/domain/i-repo/customer-invoice-repo";
+import CustomerInvoiceDbRepo from "@/feature/core/customer-invoice/data/repo/customer-invoice-db.repo";
+import { customerInvoiceRepoKey } from "@/feature/core/customer-invoice/domain/i-repo/customer-invoice.repo";
 import { DependencyContainer } from "tsyringe";
 
 export default function getCustomerInvoiceDi(): DependencyContainer {
diff --git a/src/feature/core/customer-invoice/data/repo/customer-invoice-db-repo.ts b/src/feature/core/customer-invoice/data/repo/customer-invoice-db.repo.ts
similarity index 93%
rename from src/feature/core/customer-invoice/data/repo/customer-invoice-db-repo.ts
rename to src/feature/core/customer-invoice/data/repo/customer-invoice-db.repo.ts
index 243b8e1..eee3fd4 100644
--- a/src/feature/core/customer-invoice/data/repo/customer-invoice-db-repo.ts
+++ b/src/feature/core/customer-invoice/data/repo/customer-invoice-db.repo.ts
@@ -1,10 +1,10 @@
 import { sql } from "@/bootstrap/boundaries/db/db";
 import ApiTask from "@/feature/common/data/api-task";
 import { failureOr } from "@/feature/common/failures/failure-helpers";
-import NetworkFailure from "@/feature/common/failures/network-failure";
+import NetworkFailure from "@/feature/common/failures/network.failure";
 import { formatCurrency } from "@/feature/common/feature-helpers";
-import CustomerInvoice from "@/feature/core/customer-invoice/domain/entity/customer-invoice";
-import CustomerInvoiceRepo from "@/feature/core/customer-invoice/domain/i-repo/customer-invoice-repo";
+import CustomerInvoice from "@/feature/core/customer-invoice/domain/entity/customer-invoice.entity";
+import CustomerInvoiceRepo from "@/feature/core/customer-invoice/domain/i-repo/customer-invoice.repo";
 import { pipe } from "fp-ts/lib/function";
 import { tryCatch } from "fp-ts/lib/TaskEither";
 import postgres from "postgres";
diff --git a/src/feature/core/customer-invoice/domain/entity/customer-invoice.ts b/src/feature/core/customer-invoice/domain/entity/customer-invoice.entity.ts
similarity index 100%
rename from src/feature/core/customer-invoice/domain/entity/customer-invoice.ts
rename to src/feature/core/customer-invoice/domain/entity/customer-invoice.entity.ts
diff --git a/src/feature/core/customer-invoice/domain/i-repo/customer-invoice-repo.ts b/src/feature/core/customer-invoice/domain/i-repo/customer-invoice.repo.ts
similarity index 88%
rename from src/feature/core/customer-invoice/domain/i-repo/customer-invoice-repo.ts
rename to src/feature/core/customer-invoice/domain/i-repo/customer-invoice.repo.ts
index 17a7f4d..d15a598 100644
--- a/src/feature/core/customer-invoice/domain/i-repo/customer-invoice-repo.ts
+++ b/src/feature/core/customer-invoice/domain/i-repo/customer-invoice.repo.ts
@@ -1,5 +1,5 @@
 import ApiTask from "@/feature/common/data/api-task";
-import CustomerInvoice from "@/feature/core/customer-invoice/domain/entity/customer-invoice";
+import CustomerInvoice from "@/feature/core/customer-invoice/domain/entity/customer-invoice.entity";
 
 export default interface CustomerInvoiceRepo {
   fetchList(): ApiTask<CustomerInvoice[]>;
diff --git a/src/feature/core/customer-invoice/domain/usecase/fetch-customer-invoices-usecase.ts b/src/feature/core/customer-invoice/domain/usecase/fetch-customer-invoices.usecase.ts
similarity index 81%
rename from src/feature/core/customer-invoice/domain/usecase/fetch-customer-invoices-usecase.ts
rename to src/feature/core/customer-invoice/domain/usecase/fetch-customer-invoices.usecase.ts
index 7109cef..710e291 100644
--- a/src/feature/core/customer-invoice/domain/usecase/fetch-customer-invoices-usecase.ts
+++ b/src/feature/core/customer-invoice/domain/usecase/fetch-customer-invoices.usecase.ts
@@ -1,11 +1,11 @@
 import "server-only";
 import { ApiEither } from "@/feature/common/data/api-task";
-import serverDi from "@/feature/common/server-di";
-import CustomerInvoice from "@/feature/core/customer-invoice/domain/entity/customer-invoice";
+import serverDi from "@/feature/common/server.di";
+import CustomerInvoice from "@/feature/core/customer-invoice/domain/entity/customer-invoice.entity";
 import CustomerInvoiceRepo, {
   customerInvoiceRepoKey,
-} from "@/feature/core/customer-invoice/domain/i-repo/customer-invoice-repo";
-import { customerInvoiceModuleKey } from "@/feature/core/customer-invoice/invoice-module-key";
+} from "@/feature/core/customer-invoice/domain/i-repo/customer-invoice.repo";
+import { customerInvoiceModuleKey } from "@/feature/core/customer-invoice/invoice.module-key";
 
 export default function fetchCustomerInvoicesUsecase(): Promise<
   ApiEither<CustomerInvoice[]>
diff --git a/src/feature/core/customer-invoice/invoice-module-key.ts b/src/feature/core/customer-invoice/invoice.module-key.ts
similarity index 100%
rename from src/feature/core/customer-invoice/invoice-module-key.ts
rename to src/feature/core/customer-invoice/invoice.module-key.ts
diff --git a/src/feature/core/customer/data/repo/customer-db-repo.ts b/src/feature/core/customer/data/repo/customer-db-repo.ts
index 5d08bc7..6eeb39c 100644
--- a/src/feature/core/customer/data/repo/customer-db-repo.ts
+++ b/src/feature/core/customer/data/repo/customer-db-repo.ts
@@ -1,7 +1,7 @@
 import { sql } from "@/bootstrap/boundaries/db/db";
 import ApiTask from "@/feature/common/data/api-task";
 import { failureOr } from "@/feature/common/failures/failure-helpers";
-import NetworkFailure from "@/feature/common/failures/network-failure";
+import NetworkFailure from "@/feature/common/failures/network.failure";
 import { formatCurrency } from "@/feature/common/feature-helpers";
 import Customer from "@/feature/core/customer/domain/entity/customer";
 import CustomerRepo from "@/feature/core/customer/domain/i-repo/customer-repo";
diff --git a/src/feature/core/customer/domain/usecase/fetch-customers-amount-usecase.ts b/src/feature/core/customer/domain/usecase/fetch-customers-amount-usecase.ts
index e184514..0660119 100644
--- a/src/feature/core/customer/domain/usecase/fetch-customers-amount-usecase.ts
+++ b/src/feature/core/customer/domain/usecase/fetch-customers-amount-usecase.ts
@@ -1,5 +1,5 @@
 import "server-only";
-import serverDi from "@/feature/common/server-di";
+import serverDi from "@/feature/common/server.di";
 import { customerKey } from "@/feature/core/customer/customer-key";
 import CustomerRepo, {
   customerRepoKey,
diff --git a/src/feature/core/customer/domain/usecase/fetch-customers-usecase.ts b/src/feature/core/customer/domain/usecase/fetch-customers-usecase.ts
index 0418725..cb3b240 100644
--- a/src/feature/core/customer/domain/usecase/fetch-customers-usecase.ts
+++ b/src/feature/core/customer/domain/usecase/fetch-customers-usecase.ts
@@ -1,6 +1,6 @@
 import "server-only";
 import { ApiEither } from "@/feature/common/data/api-task";
-import serverDi from "@/feature/common/server-di";
+import serverDi from "@/feature/common/server.di";
 import { customerKey } from "@/feature/core/customer/customer-key";
 import Customer from "@/feature/core/customer/domain/entity/customer";
 import CustomerRepo, {
diff --git a/src/feature/core/invoice/data/module/invoice-di.ts b/src/feature/core/invoice/data/module/invoice.di.ts
similarity index 91%
rename from src/feature/core/invoice/data/module/invoice-di.ts
rename to src/feature/core/invoice/data/module/invoice.di.ts
index e42ae4b..641faee 100644
--- a/src/feature/core/invoice/data/module/invoice-di.ts
+++ b/src/feature/core/invoice/data/module/invoice.di.ts
@@ -1,6 +1,6 @@
 import di from "@/bootstrap/di/init-di";
-import invoiceDbRepo from "@/feature/core/invoice/data/repo/invoice-db-repo";
-import { invoiceRepoKey } from "@/feature/core/invoice/domain/i-repo/invoice-repo";
+import invoiceDbRepo from "@/feature/core/invoice/data/repo/invoice-db.repo";
+import { invoiceRepoKey } from "@/feature/core/invoice/domain/i-repo/invoice.i-repo";
 import { DependencyContainer } from "tsyringe";
 
 export default function getInvoiceDi(): DependencyContainer {
diff --git a/src/feature/core/invoice/data/repo/invoice-db-repo.ts b/src/feature/core/invoice/data/repo/invoice-db.repo.ts
similarity index 94%
rename from src/feature/core/invoice/data/repo/invoice-db-repo.ts
rename to src/feature/core/invoice/data/repo/invoice-db.repo.ts
index 9c7603a..e381f9a 100644
--- a/src/feature/core/invoice/data/repo/invoice-db-repo.ts
+++ b/src/feature/core/invoice/data/repo/invoice-db.repo.ts
@@ -1,11 +1,11 @@
 import { sql } from "@/bootstrap/boundaries/db/db";
 import ApiTask from "@/feature/common/data/api-task";
 import { failureOr } from "@/feature/common/failures/failure-helpers";
-import NetworkFailure from "@/feature/common/failures/network-failure";
+import NetworkFailure from "@/feature/common/failures/network.failure";
 import { formatCurrency } from "@/feature/common/feature-helpers";
-import InvoiceRepo from "@/feature/core/invoice/domain/i-repo/invoice-repo";
-import { InvoiceParam } from "@/feature/core/invoice/domain/param/invoice-param";
-import InvoiceStatusSummary from "@/feature/core/invoice/domain/value-object/invoice-status";
+import InvoiceRepo from "@/feature/core/invoice/domain/i-repo/invoice.i-repo";
+import { InvoiceParam } from "@/feature/core/invoice/domain/param/invoice.param";
+import InvoiceStatusSummary from "@/feature/core/invoice/domain/value-object/invoice-status.value-object";
 import { pipe } from "fp-ts/lib/function";
 import { tryCatch } from "fp-ts/lib/TaskEither";
 import postgres from "postgres";
diff --git a/src/feature/core/invoice/domain/i-repo/invoice-repo.ts b/src/feature/core/invoice/domain/i-repo/invoice.i-repo.ts
similarity index 87%
rename from src/feature/core/invoice/domain/i-repo/invoice-repo.ts
rename to src/feature/core/invoice/domain/i-repo/invoice.i-repo.ts
index 049fa98..819721c 100644
--- a/src/feature/core/invoice/domain/i-repo/invoice-repo.ts
+++ b/src/feature/core/invoice/domain/i-repo/invoice.i-repo.ts
@@ -1,6 +1,6 @@
 import ApiTask from "@/feature/common/data/api-task";
-import { InvoiceParam } from "@/feature/core/invoice/domain/param/invoice-param";
-import InvoiceStatusSummary from "@/feature/core/invoice/domain/value-object/invoice-status";
+import { InvoiceParam } from "@/feature/core/invoice/domain/param/invoice.param";
+import InvoiceStatusSummary from "@/feature/core/invoice/domain/value-object/invoice-status.value-object";
 
 export default interface InvoiceRepo {
   fetchAllInvoicesAmount(): Promise<number>;
diff --git a/src/feature/core/invoice/domain/param/invoice-param.ts b/src/feature/core/invoice/domain/param/invoice.param.ts
similarity index 100%
rename from src/feature/core/invoice/domain/param/invoice-param.ts
rename to src/feature/core/invoice/domain/param/invoice.param.ts
diff --git a/src/feature/core/invoice/domain/usecase/create-invoice-usecase.ts b/src/feature/core/invoice/domain/usecase/create-invoice.usecase.ts
similarity index 78%
rename from src/feature/core/invoice/domain/usecase/create-invoice-usecase.ts
rename to src/feature/core/invoice/domain/usecase/create-invoice.usecase.ts
index 7c2f136..b190856 100644
--- a/src/feature/core/invoice/domain/usecase/create-invoice-usecase.ts
+++ b/src/feature/core/invoice/domain/usecase/create-invoice.usecase.ts
@@ -1,16 +1,16 @@
 "use server";
 
 import { ApiEither } from "@/feature/common/data/api-task";
-import ParamsFailure from "@/feature/common/failures/params-failure";
-import serverDi from "@/feature/common/server-di";
+import ParamsFailure from "@/feature/common/failures/params.failure";
+import serverDi from "@/feature/common/server.di";
 import InvoiceRepo, {
   invoiceRepoKey,
-} from "@/feature/core/invoice/domain/i-repo/invoice-repo";
+} from "@/feature/core/invoice/domain/i-repo/invoice.i-repo";
 import {
   InvoiceParam,
   invoiceSchema,
-} from "@/feature/core/invoice/domain/param/invoice-param";
-import { invoiceModuleKey } from "@/feature/core/invoice/invoice-module-key";
+} from "@/feature/core/invoice/domain/param/invoice.param";
+import { invoiceModuleKey } from "@/feature/core/invoice/invoice.module-key";
 import { pipe } from "fp-ts/lib/function";
 import { chain, fromNullable, left, map, right } from "fp-ts/lib/TaskEither";
 
diff --git a/src/feature/core/invoice/domain/usecase/fetch-all-invoices-amount-usecase.ts b/src/feature/core/invoice/domain/usecase/fetch-all-invoices-amount.usecase.ts
similarity index 71%
rename from src/feature/core/invoice/domain/usecase/fetch-all-invoices-amount-usecase.ts
rename to src/feature/core/invoice/domain/usecase/fetch-all-invoices-amount.usecase.ts
index 77aa180..67dfd8d 100644
--- a/src/feature/core/invoice/domain/usecase/fetch-all-invoices-amount-usecase.ts
+++ b/src/feature/core/invoice/domain/usecase/fetch-all-invoices-amount.usecase.ts
@@ -1,9 +1,9 @@
 import "server-only";
-import serverDi from "@/feature/common/server-di";
+import serverDi from "@/feature/common/server.di";
 import InvoiceRepo, {
   invoiceRepoKey,
-} from "@/feature/core/invoice/domain/i-repo/invoice-repo";
-import { invoiceModuleKey } from "@/feature/core/invoice/invoice-module-key";
+} from "@/feature/core/invoice/domain/i-repo/invoice.i-repo";
+import { invoiceModuleKey } from "@/feature/core/invoice/invoice.module-key";
 
 export default function fetchAllInvoicesAmountUsecase(): Promise<number> {
   const repo = serverDi(invoiceModuleKey).resolve<InvoiceRepo>(invoiceRepoKey);
diff --git a/src/feature/core/invoice/domain/usecase/fetch-invoices-status-summary.ts b/src/feature/core/invoice/domain/usecase/fetch-invoices-status-summary.usecase.ts
similarity index 70%
rename from src/feature/core/invoice/domain/usecase/fetch-invoices-status-summary.ts
rename to src/feature/core/invoice/domain/usecase/fetch-invoices-status-summary.usecase.ts
index 6ef1a31..7407635 100644
--- a/src/feature/core/invoice/domain/usecase/fetch-invoices-status-summary.ts
+++ b/src/feature/core/invoice/domain/usecase/fetch-invoices-status-summary.usecase.ts
@@ -1,10 +1,10 @@
 import "server-only";
-import serverDi from "@/feature/common/server-di";
+import serverDi from "@/feature/common/server.di";
 import InvoiceRepo, {
   invoiceRepoKey,
-} from "@/feature/core/invoice/domain/i-repo/invoice-repo";
-import InvoiceStatusSummary from "@/feature/core/invoice/domain/value-object/invoice-status";
-import { invoiceModuleKey } from "@/feature/core/invoice/invoice-module-key";
+} from "@/feature/core/invoice/domain/i-repo/invoice.i-repo";
+import InvoiceStatusSummary from "@/feature/core/invoice/domain/value-object/invoice-status.value-object";
+import { invoiceModuleKey } from "@/feature/core/invoice/invoice.module-key";
 
 export default function fetchInvoicesStatusSummary(): Promise<InvoiceStatusSummary> {
   const repo = serverDi(invoiceModuleKey).resolve<InvoiceRepo>(invoiceRepoKey);
diff --git a/src/feature/core/invoice/domain/value-object/invoice-status.ts b/src/feature/core/invoice/domain/value-object/invoice-status.value-object.ts
similarity index 100%
rename from src/feature/core/invoice/domain/value-object/invoice-status.ts
rename to src/feature/core/invoice/domain/value-object/invoice-status.value-object.ts
diff --git a/src/feature/core/invoice/invoice-module-key.ts b/src/feature/core/invoice/invoice.module-key.ts
similarity index 100%
rename from src/feature/core/invoice/invoice-module-key.ts
rename to src/feature/core/invoice/invoice.module-key.ts
diff --git a/src/feature/core/revenue/data/module/revenue-di.ts b/src/feature/core/revenue/data/module/revenue.di.ts
similarity index 90%
rename from src/feature/core/revenue/data/module/revenue-di.ts
rename to src/feature/core/revenue/data/module/revenue.di.ts
index 8e1f828..8f519de 100644
--- a/src/feature/core/revenue/data/module/revenue-di.ts
+++ b/src/feature/core/revenue/data/module/revenue.di.ts
@@ -1,6 +1,6 @@
 import di from "@/bootstrap/di/init-di";
-import RevenueDbRepo from "@/feature/core/revenue/data/repo/revenue-db-repo";
-import { revenueRepoKey } from "@/feature/core/revenue/domain/i-repo/revenue-repo";
+import RevenueDbRepo from "@/feature/core/revenue/data/repo/revenue-db.repo";
+import { revenueRepoKey } from "@/feature/core/revenue/domain/i-repo/revenue.i-repo";
 
 export default function getRevenueDi() {
   const revenueDi = di.createChildContainer();
diff --git a/src/feature/core/revenue/data/repo/revenue-db-repo.ts b/src/feature/core/revenue/data/repo/revenue-db.repo.ts
similarity index 97%
rename from src/feature/core/revenue/data/repo/revenue-db-repo.ts
rename to src/feature/core/revenue/data/repo/revenue-db.repo.ts
index 2b89341..42af245 100644
--- a/src/feature/core/revenue/data/repo/revenue-db-repo.ts
+++ b/src/feature/core/revenue/data/repo/revenue-db.repo.ts
@@ -1,6 +1,6 @@
 import { sql } from "@/bootstrap/boundaries/db/db";
-import Revenue from "@/feature/core/revenue/domain/entity/revenue";
-import RevenueRepo from "@/feature/core/revenue/domain/i-repo/revenue-repo";
+import Revenue from "@/feature/core/revenue/domain/entity/revenue.entity";
+import RevenueRepo from "@/feature/core/revenue/domain/i-repo/revenue.i-repo";
 import postgres from "postgres";
 
 export type RevenueDbResponse = {
diff --git a/src/feature/core/revenue/domain/entity/revenue.ts b/src/feature/core/revenue/domain/entity/revenue.entity.ts
similarity index 100%
rename from src/feature/core/revenue/domain/entity/revenue.ts
rename to src/feature/core/revenue/domain/entity/revenue.entity.ts
diff --git a/src/feature/core/revenue/domain/i-repo/revenue-repo.ts b/src/feature/core/revenue/domain/i-repo/revenue.i-repo.ts
similarity index 94%
rename from src/feature/core/revenue/domain/i-repo/revenue-repo.ts
rename to src/feature/core/revenue/domain/i-repo/revenue.i-repo.ts
index 7b67fd5..a5de38b 100644
--- a/src/feature/core/revenue/domain/i-repo/revenue-repo.ts
+++ b/src/feature/core/revenue/domain/i-repo/revenue.i-repo.ts
@@ -1,4 +1,4 @@
-import Revenue from "@/feature/core/revenue/domain/entity/revenue";
+import Revenue from "@/feature/core/revenue/domain/entity/revenue.entity";
 
 export default interface RevenueRepo {
   fetchRevenues(): Promise<Revenue[]>;
diff --git a/src/feature/core/revenue/domain/revenue-module-key.ts b/src/feature/core/revenue/domain/revenue.module-key.ts
similarity index 100%
rename from src/feature/core/revenue/domain/revenue-module-key.ts
rename to src/feature/core/revenue/domain/revenue.module-key.ts
diff --git a/src/feature/core/revenue/domain/usecase/fetch-revenues-usecase.ts b/src/feature/core/revenue/domain/usecase/fetch-revenues.usecase.ts
similarity index 72%
rename from src/feature/core/revenue/domain/usecase/fetch-revenues-usecase.ts
rename to src/feature/core/revenue/domain/usecase/fetch-revenues.usecase.ts
index ed1812c..e1a00f3 100644
--- a/src/feature/core/revenue/domain/usecase/fetch-revenues-usecase.ts
+++ b/src/feature/core/revenue/domain/usecase/fetch-revenues.usecase.ts
@@ -1,10 +1,10 @@
 import "server-only";
-import serverDi from "@/feature/common/server-di";
-import Revenue from "@/feature/core/revenue/domain/entity/revenue";
+import serverDi from "@/feature/common/server.di";
+import Revenue from "@/feature/core/revenue/domain/entity/revenue.entity";
 import RevenueRepo, {
   revenueRepoKey,
-} from "@/feature/core/revenue/domain/i-repo/revenue-repo";
-import { revenueModuleKey } from "@/feature/core/revenue/domain/revenue-module-key";
+} from "@/feature/core/revenue/domain/i-repo/revenue.i-repo";
+import { revenueModuleKey } from "@/feature/core/revenue/domain/revenue.module-key";
 
 export default function fetchRevenuesUsecase(): Promise<Revenue[]> {
   const repo = serverDi(revenueModuleKey).resolve<RevenueRepo>(revenueRepoKey);
diff --git a/src/feature/core/summary-info/data/module/summary-info-di.ts b/src/feature/core/summary-info/data/module/summary-info.di.ts
similarity index 87%
rename from src/feature/core/summary-info/data/module/summary-info-di.ts
rename to src/feature/core/summary-info/data/module/summary-info.di.ts
index 78e8bc7..e139e28 100644
--- a/src/feature/core/summary-info/data/module/summary-info-di.ts
+++ b/src/feature/core/summary-info/data/module/summary-info.di.ts
@@ -1,6 +1,6 @@
 import fetchCustomersAmountUsecase from "@/feature/core/customer/domain/usecase/fetch-customers-amount-usecase";
-import fetchAllInvoicesAmountUsecase from "@/feature/core/invoice/domain/usecase/fetch-all-invoices-amount-usecase";
-import fetchInvoicesStatusSummary from "@/feature/core/invoice/domain/usecase/fetch-invoices-status-summary";
+import fetchAllInvoicesAmountUsecase from "@/feature/core/invoice/domain/usecase/fetch-all-invoices-amount.usecase";
+import fetchInvoicesStatusSummary from "@/feature/core/invoice/domain/usecase/fetch-invoices-status-summary.usecase";
 import di from "@/bootstrap/di/init-di";
 
 export default function getSummaryInfoDi() {
diff --git a/src/feature/core/summary-info/domain/summary-info-module-key.ts b/src/feature/core/summary-info/domain/summary-info.module-key.ts
similarity index 100%
rename from src/feature/core/summary-info/domain/summary-info-module-key.ts
rename to src/feature/core/summary-info/domain/summary-info.module-key.ts
diff --git a/src/feature/core/summary-info/domain/usecase/fetch-summary-info-usecase.ts b/src/feature/core/summary-info/domain/usecase/fetch-summary-info.usecase.ts
similarity index 85%
rename from src/feature/core/summary-info/domain/usecase/fetch-summary-info-usecase.ts
rename to src/feature/core/summary-info/domain/usecase/fetch-summary-info.usecase.ts
index 84af863..5c2a945 100644
--- a/src/feature/core/summary-info/domain/usecase/fetch-summary-info-usecase.ts
+++ b/src/feature/core/summary-info/domain/usecase/fetch-summary-info.usecase.ts
@@ -1,10 +1,10 @@
 import "server-only";
-import serverDi from "@/feature/common/server-di";
+import serverDi from "@/feature/common/server.di";
 import fetchCustomersAmountUsecase from "@/feature/core/customer/domain/usecase/fetch-customers-amount-usecase";
-import fetchAllInvoicesAmountUsecase from "@/feature/core/invoice/domain/usecase/fetch-all-invoices-amount-usecase";
-import fetchInvoicesStatusSummary from "@/feature/core/invoice/domain/usecase/fetch-invoices-status-summary";
-import { summaryInfoModuleKey } from "@/feature/core/summary-info/domain/summary-info-module-key";
-import SummaryInfo from "@/feature/core/summary-info/domain/value-object/summary-info";
+import fetchAllInvoicesAmountUsecase from "@/feature/core/invoice/domain/usecase/fetch-all-invoices-amount.usecase";
+import fetchInvoicesStatusSummary from "@/feature/core/invoice/domain/usecase/fetch-invoices-status-summary.usecase";
+import { summaryInfoModuleKey } from "@/feature/core/summary-info/domain/summary-info.module-key";
+import SummaryInfo from "@/feature/core/summary-info/domain/value-object/summary-info.value-object";
 
 export default async function fetchSummaryInfoUsecase(): Promise<SummaryInfo> {
   try {
diff --git a/src/feature/core/summary-info/domain/value-object/summary-info.ts b/src/feature/core/summary-info/domain/value-object/summary-info.value-object.ts
similarity index 90%
rename from src/feature/core/summary-info/domain/value-object/summary-info.ts
rename to src/feature/core/summary-info/domain/value-object/summary-info.value-object.ts
index 19d4fff..8fd8e4f 100644
--- a/src/feature/core/summary-info/domain/value-object/summary-info.ts
+++ b/src/feature/core/summary-info/domain/value-object/summary-info.value-object.ts
@@ -1,4 +1,4 @@
-import InvoiceStatusSummary from "@/feature/core/invoice/domain/value-object/invoice-status";
+import InvoiceStatusSummary from "@/feature/core/invoice/domain/value-object/invoice-status.value-object";
 
 export default class SummaryInfo {
   customersNumber: number;
diff --git a/src/test/common/fake-factory/customer/customer-fake-factory.ts b/src/test/common/fake-factory/customer/customer.fake-factory.ts
similarity index 100%
rename from src/test/common/fake-factory/customer/customer-fake-factory.ts
rename to src/test/common/fake-factory/customer/customer.fake-factory.ts
diff --git a/src/test/common/mock/mock-di.ts b/src/test/common/mock/mock-di.ts
index 6e7b03d..79f9b7f 100644
--- a/src/test/common/mock/mock-di.ts
+++ b/src/test/common/mock/mock-di.ts
@@ -1,6 +1,9 @@
 import di from "@/bootstrap/di/init-di";
-import * as serverDi from "@/feature/common/server-di";
+import * as serverDi from "@/feature/common/server.di";
 
+/**
+ * To mock and get server di
+ */
 export default function mockDi() {
   vi.spyOn(serverDi, "default").mockReturnValue(di);
   return di;
diff --git a/src/test/common/mock/mock-factory.ts b/src/test/common/mock/mock-factory.ts
index 8635c9e..671915a 100644
--- a/src/test/common/mock/mock-factory.ts
+++ b/src/test/common/mock/mock-factory.ts
@@ -1,5 +1,8 @@
 import { Mock } from "moq.ts";
 
+/**
+ * To get mock object to mock objects and classes
+ */
 export function getMock<T>() {
   return new Mock<T>();
 }
diff --git a/src/test/unit/feature/customer/domain/usecase/fetch-customers-usecase.test.ts b/src/test/unit/feature/customer/domain/usecase/fetch-customers.usecase.test.ts
similarity index 98%
rename from src/test/unit/feature/customer/domain/usecase/fetch-customers-usecase.test.ts
rename to src/test/unit/feature/customer/domain/usecase/fetch-customers.usecase.test.ts
index 437f9c9..4dcab8f 100644
--- a/src/test/unit/feature/customer/domain/usecase/fetch-customers-usecase.test.ts
+++ b/src/test/unit/feature/customer/domain/usecase/fetch-customers.usecase.test.ts
@@ -4,7 +4,7 @@ import CustomerRepo, {
 import { getMock } from "@/test/common/mock/mock-factory";
 import { describe } from "vitest";
 import { faker } from "@faker-js/faker";
-import CustomerFakeFactory from "@/test/common/fake-factory/customer/customer-fake-factory";
+import CustomerFakeFactory from "@/test/common/fake-factory/customer/customer.fake-factory";
 import fetchCustomersUsecase from "@/feature/core/customer/domain/usecase/fetch-customers-usecase";
 import mockDi from "@/test/common/mock/mock-di";
 import { right } from "fp-ts/lib/TaskEither";