diff --git a/src/application/README.md b/src/application/README.md
new file mode 100644
index 0000000..c4c63fc
--- /dev/null
+++ b/src/application/README.md
@@ -0,0 +1,6 @@
+## Application
+
+* This layer contains application logic.
+* It only knows of the Domain Layer and the Infrastructure Layer. 
+* The services are implemented with [Vue Composable Functions](https://vueschool.io/articles/vuejs-tutorials/what-is-a-vue-js-composable/)
+
diff --git a/src/composable-functions/useModal.ts b/src/application/services/useModal.ts
similarity index 100%
rename from src/composable-functions/useModal.ts
rename to src/application/services/useModal.ts
diff --git a/src/composable-functions/useShoppingInit.ts b/src/application/services/useShoppingInit.ts
similarity index 66%
rename from src/composable-functions/useShoppingInit.ts
rename to src/application/services/useShoppingInit.ts
index 87bb3f2..536b3df 100644
--- a/src/composable-functions/useShoppingInit.ts
+++ b/src/application/services/useShoppingInit.ts
@@ -1,7 +1,6 @@
 import { onMounted } from "vue";
-import { useStore } from "@/store";
-
-import { ACTIONS } from "@/enums/shopping";
+import { useStore } from "@/infrastructure/store";
+import { ACTIONS } from "@/infrastructure/store/shopping/shopping.types";
 
 export default function useShoppingInit() {
   const store = useStore();
diff --git a/src/composable-functions/useShoppingProducts.ts b/src/application/services/useShoppingProducts.ts
similarity index 69%
rename from src/composable-functions/useShoppingProducts.ts
rename to src/application/services/useShoppingProducts.ts
index eea900f..3be34b0 100644
--- a/src/composable-functions/useShoppingProducts.ts
+++ b/src/application/services/useShoppingProducts.ts
@@ -1,10 +1,11 @@
 import { computed } from "vue";
-import { useStore } from "@/store";
+import { useStore } from "@/infrastructure/store";
 
-import { Product } from "@/domain/checkout/checkout.types";
-
-import PRODUCT_CODE from "@/enums/product";
-import { ACTIONS, GETTERS } from "@/enums/shopping";
+import { Product, PRODUCT_CODE } from "@/domain/checkout/checkout.types";
+import {
+  ACTIONS,
+  GETTERS
+} from "@/infrastructure/store/shopping/shopping.types";
 
 export default function useShopping() {
   const store = useStore();
diff --git a/src/composable-functions/useShoppingSummary.ts b/src/application/services/useShoppingSummary.ts
similarity index 87%
rename from src/composable-functions/useShoppingSummary.ts
rename to src/application/services/useShoppingSummary.ts
index 1ff96fe..fc40e6c 100644
--- a/src/composable-functions/useShoppingSummary.ts
+++ b/src/application/services/useShoppingSummary.ts
@@ -1,8 +1,8 @@
 import { computed } from "vue";
-import { useStore } from "@/store";
+import { useStore } from "@/infrastructure/store";
 
-import { GETTERS } from "@/enums/shopping";
 import { TotalDiscountItem } from "@/domain/checkout/checkout.types";
+import { GETTERS } from "@/infrastructure/store/shopping/shopping.types";
 
 export default function useShopping() {
   const store = useStore();
diff --git a/src/domain/README.md b/src/domain/README.md
new file mode 100644
index 0000000..a94e8d1
--- /dev/null
+++ b/src/domain/README.md
@@ -0,0 +1,5 @@
+## Domain
+
+* This layer is for domain/business logic.
+* Only business logic lives in the Domain layer
+* It is just pure TypeScript code with no frameworks/libraries whatsoever here.
diff --git a/src/domain/checkout/checkout.service.ts b/src/domain/checkout/checkout.service.ts
index 621a3d0..82bd5f1 100644
--- a/src/domain/checkout/checkout.service.ts
+++ b/src/domain/checkout/checkout.service.ts
@@ -1,5 +1,5 @@
-import PRODUCT_CODE from "@/enums/product";
-import DISCOUNT_CODE from "@/enums/discount";
+import { PRODUCT_CODE } from "@/domain/checkout/checkout.types";
+import { DISCOUNT_CODE } from "@/domain/discount-rules/discount.rules.types";
 
 import {
   PricingRule,
diff --git a/src/domain/checkout/checkout.types.ts b/src/domain/checkout/checkout.types.ts
index 8e75831..cc1e7df 100644
--- a/src/domain/checkout/checkout.types.ts
+++ b/src/domain/checkout/checkout.types.ts
@@ -1,5 +1,11 @@
-import PRODUCT_CODE from "@/enums/product";
-import DISCOUNT_CODE from "@/enums/discount";
+import { DISCOUNT_CODE } from "@/domain/discount-rules/discount.rules.types";
+
+export enum PRODUCT_CODE {
+  CAP = "CAP",
+  TSHIRT = "TSHIRT",
+  MUG = "MUG",
+  EMPTY = "EMPTY"
+}
 
 export interface PricingRule {
   code: PRODUCT_CODE;
diff --git a/src/domain/discount-rules/discount.rules.factory.ts b/src/domain/discount-rules/discount.rules.factory.ts
index 4eb32e6..25cd9bd 100644
--- a/src/domain/discount-rules/discount.rules.factory.ts
+++ b/src/domain/discount-rules/discount.rules.factory.ts
@@ -1,5 +1,5 @@
-import PRODUCT_CODE from "@/enums/product";
-import DISCOUNT_CODE from "@/enums/discount";
+import { PRODUCT_CODE } from "@/domain/checkout/checkout.types";
+import { DISCOUNT_CODE } from "@/domain/discount-rules/discount.rules.types";
 
 import { ScannerItem } from "@/domain/checkout/checkout.types";
 import { DiscountRule } from "@/domain/discount-rules/discount.rules.types";
diff --git a/src/domain/discount-rules/discount.rules.service.ts b/src/domain/discount-rules/discount.rules.service.ts
index ccf5076..5ed1d42 100644
--- a/src/domain/discount-rules/discount.rules.service.ts
+++ b/src/domain/discount-rules/discount.rules.service.ts
@@ -1,4 +1,4 @@
-import DISCOUNT_CODE from "@/enums/discount";
+import { DISCOUNT_CODE } from "@/domain/discount-rules/discount.rules.types";
 
 import { DiscountRule } from "@/domain/discount-rules/discount.rules.types";
 import { discountFactory } from "@/domain/discount-rules/discount.rules.factory";
diff --git a/src/domain/discount-rules/discount.rules.types.ts b/src/domain/discount-rules/discount.rules.types.ts
index fea7998..739adf3 100644
--- a/src/domain/discount-rules/discount.rules.types.ts
+++ b/src/domain/discount-rules/discount.rules.types.ts
@@ -1,8 +1,12 @@
-import PRODUCT_CODE from "@/enums/product";
-import DISCOUNT_CODE from "@/enums/discount";
-
+import { PRODUCT_CODE } from "@/domain/checkout/checkout.types";
 import { ScannerItem } from "@/domain/checkout/checkout.types";
 
+export enum DISCOUNT_CODE {
+  TWO_X_ONE = "TWO_X_ONE",
+  BULK = "BULK",
+  PROMO_CODE = "PROMO_CODE"
+}
+
 export interface DiscountRule {
   code: DISCOUNT_CODE;
   literal: string;
diff --git a/src/enums/discount.ts b/src/enums/discount.ts
deleted file mode 100644
index 9833094..0000000
--- a/src/enums/discount.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-enum CODE {
-  TWO_X_ONE = "TWO_X_ONE",
-  BULK = "BULK",
-  PROMO_CODE = "PROMO_CODE"
-}
-
-export default CODE;
diff --git a/src/enums/modal.ts b/src/enums/modal.ts
deleted file mode 100644
index 2cc1da3..0000000
--- a/src/enums/modal.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-enum MODAL_MUTATION {
-  DISPLAY = "DISPLAY"
-}
-
-export default MODAL_MUTATION;
diff --git a/src/enums/product.ts b/src/enums/product.ts
deleted file mode 100644
index e515c7d..0000000
--- a/src/enums/product.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-enum CODE {
-  CAP = "CAP",
-  TSHIRT = "TSHIRT",
-  MUG = "MUG",
-  EMPTY = "EMPTY"
-}
-
-export default CODE;
diff --git a/src/enums/shopping.ts b/src/enums/shopping.ts
deleted file mode 100644
index e144a37..0000000
--- a/src/enums/shopping.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-export enum MUTATION {
-  SAVE_PRODUCTS = "SAVE_PRODUCTS",
-  SAVE_TOTAL_COST = "SAVE_TOTAL_COST",
-  SAVE_TOTAL_ITEMS = "SAVE_TOTAL_ITEMS",
-  SAVE_DISCOUNTS_APPLIED = "SAVE_DISCOUNTS_APPLIED",
-  SAVE_TOTAL_COST_WITH_DISCOUNTS = "SAVE_TOTAL_COST_WITH_DISCOUNTS"
-}
-
-export enum ACTIONS {
-  INIT_SHOPPING_CART = "INIT_SHOPPING_CART",
-  SCAN_PRODUCT = "SCAN_PRODUCT",
-  REMOVE_PRODUCT = "REMOVE_PRODUCT"
-}
-
-export enum GETTERS {
-  PRODUCTS = "PRODUCTS",
-  TOTAL_COST = "TOTAL_COST",
-  TOTAL_ITEMS = "TOTAL_ITEMS",
-  DISCOUNTS_APPLIED = "DISCOUNTS_APPLIED",
-  TOTAL_COST_WITH_DISCOUNTS = "TOTAL_COST_WITH_DISCOUNTS",
-  HAS_TOTAL_COST = "HAS_TOTAL_COST",
-  HAS_DISCOUNTS_APPLIED = "HAS_DISCOUNTS_APPLIED"
-}
diff --git a/src/infrastructure/README.md b/src/infrastructure/README.md
new file mode 100644
index 0000000..346e7a5
--- /dev/null
+++ b/src/infrastructure/README.md
@@ -0,0 +1,7 @@
+## Infrastructure
+
+* This layer is responsible for communications with the outside world (sending requests/receiving responses) and storing local data.
+* HTTP: Fetch API
+* State Management: Vuex
+
+
diff --git a/src/api/index.ts b/src/infrastructure/http/index.ts
similarity index 80%
rename from src/api/index.ts
rename to src/infrastructure/http/index.ts
index 7bbfc71..75a7671 100644
--- a/src/api/index.ts
+++ b/src/infrastructure/http/index.ts
@@ -5,7 +5,7 @@ import { Product } from "@/domain/checkout/checkout.types";
  */
 function mockProducts() {
   return import(
-    /* webpackChunkName: "async-mock-products" */ "@/api/mocks/products.json"
+    /* webpackChunkName: "async-mock-products" */ "@/infrastructure/http/mocks/products.json"
   );
 }
 
diff --git a/src/api/mocks/products.json b/src/infrastructure/http/mocks/products.json
similarity index 100%
rename from src/api/mocks/products.json
rename to src/infrastructure/http/mocks/products.json
diff --git a/src/store/index.ts b/src/infrastructure/store/index.ts
similarity index 73%
rename from src/store/index.ts
rename to src/infrastructure/store/index.ts
index a8c3d35..6a2f19c 100644
--- a/src/store/index.ts
+++ b/src/infrastructure/store/index.ts
@@ -5,8 +5,8 @@ import {
   useStore as baseUseStore
 } from "vuex";
 
-import { StateRoot } from "@/store/types";
-import Shopping from "@/store/shopping";
+import { StateRoot } from "@/infrastructure/store/store.types";
+import Shopping from "@/infrastructure/store/shopping";
 
 export const key: InjectionKey<VuexStore<StateRoot>> = Symbol();
 
diff --git a/src/store/shopping/actions.ts b/src/infrastructure/store/shopping/actions.ts
similarity index 88%
rename from src/store/shopping/actions.ts
rename to src/infrastructure/store/shopping/actions.ts
index e2f7efa..ef6ce7d 100644
--- a/src/store/shopping/actions.ts
+++ b/src/infrastructure/store/shopping/actions.ts
@@ -1,16 +1,19 @@
 import { ActionContext, ActionTree } from "vuex";
 
-import API from "@/api";
+import http from "@/infrastructure/http";
 import CheckoutService from "@/domain/checkout/checkout.service";
 import DiscountRulesService from "@/domain/discount-rules/discount.rules.service";
 
-import { StateRoot } from "@/store/types";
-import { ShoppingActions } from "@/store/shopping/types";
+import { StateRoot } from "@/infrastructure/store/store.types";
+import { ShoppingActions } from "@/infrastructure/store/shopping/shopping.types";
 import { Product, PricingRule } from "@/domain/checkout/checkout.types";
 import { DiscountRule } from "@/domain/discount-rules/discount.rules.types";
 
-import PRODUCT_CODE from "@/enums/product";
-import { ACTIONS, MUTATION } from "@/enums/shopping";
+import { PRODUCT_CODE } from "@/domain/checkout/checkout.types";
+import {
+  ACTIONS,
+  MUTATION
+} from "@/infrastructure/store/shopping/shopping.types";
 
 let checkoutService: CheckoutService;
 const discountRulesService = new DiscountRulesService();
@@ -27,7 +30,7 @@ const actions: ActionTree<StateRoot, StateRoot> & ShoppingActions = {
     const { commit } = context;
 
     try {
-      const products: Product[] = await API.products();
+      const products: Product[] = await http.products();
 
       const pricingRules: PricingRule[] = products.map(product => ({
         code: product.code,
diff --git a/src/store/shopping/getters.ts b/src/infrastructure/store/shopping/getters.ts
similarity index 88%
rename from src/store/shopping/getters.ts
rename to src/infrastructure/store/shopping/getters.ts
index 9a354eb..ab4585c 100644
--- a/src/store/shopping/getters.ts
+++ b/src/infrastructure/store/shopping/getters.ts
@@ -1,9 +1,9 @@
 import { GetterTree } from "vuex";
 
-import { GETTERS } from "@/enums/shopping";
+import { GETTERS } from "@/infrastructure/store/shopping/shopping.types";
 
-import { StateRoot } from "@/store/types";
-import { ShoppingGetters } from "@/store/shopping/types";
+import { StateRoot } from "@/infrastructure/store/store.types";
+import { ShoppingGetters } from "@/infrastructure/store/shopping/shopping.types";
 import { Product, TotalDiscountItem } from "@/domain/checkout/checkout.types";
 
 const getters: GetterTree<StateRoot, StateRoot> & ShoppingGetters = {
diff --git a/src/infrastructure/store/shopping/index.ts b/src/infrastructure/store/shopping/index.ts
new file mode 100644
index 0000000..8a8a12d
--- /dev/null
+++ b/src/infrastructure/store/shopping/index.ts
@@ -0,0 +1,18 @@
+import { StoreOptions } from "vuex";
+
+import { StateRoot } from "@/infrastructure/store/store.types";
+
+import initialState from "@/infrastructure/store/shopping/initialState";
+import actions from "@/infrastructure/store/shopping/actions";
+import getters from "@/infrastructure/store/shopping/getters";
+import mutations from "@/infrastructure/store/shopping/mutations";
+
+const Shopping: StoreOptions<StateRoot> = {
+  strict: true,
+  state: initialState,
+  actions,
+  mutations,
+  getters
+};
+
+export default Shopping;
diff --git a/src/store/shopping/initialState.ts b/src/infrastructure/store/shopping/initialState.ts
similarity index 82%
rename from src/store/shopping/initialState.ts
rename to src/infrastructure/store/shopping/initialState.ts
index aa527fb..ff02cfa 100644
--- a/src/store/shopping/initialState.ts
+++ b/src/infrastructure/store/shopping/initialState.ts
@@ -1,4 +1,4 @@
-import { StateRoot } from "@/store/types";
+import { StateRoot } from "@/infrastructure/store/store.types";
 import { Product, Summary } from "@/domain/checkout/checkout.types";
 
 const products: Product[] = [];
diff --git a/src/store/shopping/mutations.ts b/src/infrastructure/store/shopping/mutations.ts
similarity index 78%
rename from src/store/shopping/mutations.ts
rename to src/infrastructure/store/shopping/mutations.ts
index 4f9eb92..7dd2f90 100644
--- a/src/store/shopping/mutations.ts
+++ b/src/infrastructure/store/shopping/mutations.ts
@@ -1,10 +1,9 @@
 import { MutationTree } from "vuex";
 
-import { MUTATION } from "@/enums/shopping";
-
-import { StateRoot } from "@/store/types";
-import { ShoppingMutations } from "@/store/shopping/types";
+import { StateRoot } from "@/infrastructure/store/store.types";
+import { MUTATION } from "@/infrastructure/store/shopping/shopping.types";
 import { Product, TotalDiscountItem } from "@/domain/checkout/checkout.types";
+import { ShoppingMutations } from "@/infrastructure/store/shopping/shopping.types";
 
 const mutations: MutationTree<StateRoot> & ShoppingMutations = {
   [MUTATION.SAVE_PRODUCTS](state: StateRoot, payload: Product[]) {
diff --git a/src/store/shopping/types.ts b/src/infrastructure/store/shopping/shopping.types.ts
similarity index 66%
rename from src/store/shopping/types.ts
rename to src/infrastructure/store/shopping/shopping.types.ts
index 3a20976..dc8e76d 100644
--- a/src/store/shopping/types.ts
+++ b/src/infrastructure/store/shopping/shopping.types.ts
@@ -1,10 +1,33 @@
 import { ActionContext } from "vuex";
 
-import { StateRoot } from "@/store/types";
+import { StateRoot } from "@/infrastructure/store/store.types";
 import { Product, TotalDiscountItem } from "@/domain/checkout/checkout.types";
 
-import PRODUCT_CODE from "@/enums/product";
-import { ACTIONS, MUTATION, GETTERS } from "@/enums/shopping";
+import { PRODUCT_CODE } from "@/domain/checkout/checkout.types";
+
+export enum MUTATION {
+  SAVE_PRODUCTS = "SAVE_PRODUCTS",
+  SAVE_TOTAL_COST = "SAVE_TOTAL_COST",
+  SAVE_TOTAL_ITEMS = "SAVE_TOTAL_ITEMS",
+  SAVE_DISCOUNTS_APPLIED = "SAVE_DISCOUNTS_APPLIED",
+  SAVE_TOTAL_COST_WITH_DISCOUNTS = "SAVE_TOTAL_COST_WITH_DISCOUNTS"
+}
+
+export enum ACTIONS {
+  INIT_SHOPPING_CART = "INIT_SHOPPING_CART",
+  SCAN_PRODUCT = "SCAN_PRODUCT",
+  REMOVE_PRODUCT = "REMOVE_PRODUCT"
+}
+
+export enum GETTERS {
+  PRODUCTS = "PRODUCTS",
+  TOTAL_COST = "TOTAL_COST",
+  TOTAL_ITEMS = "TOTAL_ITEMS",
+  DISCOUNTS_APPLIED = "DISCOUNTS_APPLIED",
+  TOTAL_COST_WITH_DISCOUNTS = "TOTAL_COST_WITH_DISCOUNTS",
+  HAS_TOTAL_COST = "HAS_TOTAL_COST",
+  HAS_DISCOUNTS_APPLIED = "HAS_DISCOUNTS_APPLIED"
+}
 
 type AugmentedActionContext = {
   commit<K extends keyof ShoppingMutations>(
diff --git a/src/store/types.ts b/src/infrastructure/store/store.types.ts
similarity index 93%
rename from src/store/types.ts
rename to src/infrastructure/store/store.types.ts
index 9eae1c4..b6aa22a 100644
--- a/src/store/types.ts
+++ b/src/infrastructure/store/store.types.ts
@@ -3,7 +3,7 @@ import {
   ShoppingMutations,
   ShoppingActions,
   ShoppingGetters
-} from "@/store/shopping/types";
+} from "@/infrastructure/store/shopping/shopping.types";
 import { Store as VuexStore, CommitOptions, DispatchOptions } from "vuex";
 
 export interface StateRoot {
diff --git a/src/main.ts b/src/main.ts
index 81ef89c..cc8d5df 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,7 +1,7 @@
 import { createApp } from "vue";
 
-import App from "@/App.vue";
-import { store, key } from "@/store";
+import App from "@/ui/App.vue";
+import { store, key } from "@/infrastructure/store";
 
 createApp(App)
   .use(store, key)
diff --git a/src/store/shopping/index.ts b/src/store/shopping/index.ts
deleted file mode 100644
index a50fcdb..0000000
--- a/src/store/shopping/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { StoreOptions } from "vuex";
-
-import { StateRoot } from "@/store/types";
-
-import initialState from "@/store/shopping/initialState";
-import actions from "@/store/shopping/actions";
-import getters from "@/store/shopping/getters";
-import mutations from "@/store/shopping/mutations";
-
-const Shopping: StoreOptions<StateRoot> = {
-  strict: true,
-  state: initialState,
-  actions,
-  mutations,
-  getters
-};
-
-export default Shopping;
diff --git a/src/App.vue b/src/ui/App.vue
similarity index 72%
rename from src/App.vue
rename to src/ui/App.vue
index a96be05..a8b7f2d 100644
--- a/src/App.vue
+++ b/src/ui/App.vue
@@ -7,12 +7,12 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import useShoppingInit from "@/composable-functions/useShoppingInit";
-import Products from "@/views/Products.vue";
-import Summary from "@/views/Summary.vue";
+import Products from "@/ui/views/Products.vue";
+import Summary from "@/ui/views/Summary.vue";
+import useShoppingInit from "@/application/services/useShoppingInit";
 
-import "./assets/styles/reset.css";
-import "./assets/styles/commons.css";
+import "@/ui/assets/styles/reset.css";
+import "@/ui/assets/styles/commons.css";
 
 export default defineComponent({
   name: "App",
diff --git a/src/ui/README.md b/src/ui/README.md
new file mode 100644
index 0000000..f767c00
--- /dev/null
+++ b/src/ui/README.md
@@ -0,0 +1,6 @@
+## User Interface
+
+* This layer is directly coupled to the Application Layer.
+* This layer is basically made of [Vue Single File Components](https://vuejs.org/v2/guide/single-file-components.html).
+
+
diff --git a/src/assets/styles/commons.css b/src/ui/assets/styles/commons.css
similarity index 100%
rename from src/assets/styles/commons.css
rename to src/ui/assets/styles/commons.css
diff --git a/src/assets/styles/reset.css b/src/ui/assets/styles/reset.css
similarity index 100%
rename from src/assets/styles/reset.css
rename to src/ui/assets/styles/reset.css
diff --git a/src/components/Checkout.vue b/src/ui/components/Checkout.vue
similarity index 93%
rename from src/components/Checkout.vue
rename to src/ui/components/Checkout.vue
index a2d1409..b59899e 100644
--- a/src/components/Checkout.vue
+++ b/src/ui/components/Checkout.vue
@@ -38,8 +38,8 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import useShoppingSummary from "@/composable-functions/useShoppingSummary";
-import Title from "@/components/Title.vue";
+import useShoppingSummary from "@/application/services/useShoppingSummary";
+import Title from "@/ui/components/Title.vue";
 
 export default defineComponent({
   name: "Checkout",
diff --git a/src/components/Modal.vue b/src/ui/components/Modal.vue
similarity index 94%
rename from src/components/Modal.vue
rename to src/ui/components/Modal.vue
index 11a1a87..5fe05ae 100644
--- a/src/components/Modal.vue
+++ b/src/ui/components/Modal.vue
@@ -22,8 +22,8 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import EVENT from "@/enums/event";
-import ShopButton from "@/components/core/Button.vue";
+import EVENT from "@/ui/types/event";
+import ShopButton from "@/ui/components/core/Button.vue";
 
 const { HIDE_MODAL } = EVENT;
 
diff --git a/src/components/ProductHead.vue b/src/ui/components/ProductHead.vue
similarity index 100%
rename from src/components/ProductHead.vue
rename to src/ui/components/ProductHead.vue
diff --git a/src/components/ProductItem.vue b/src/ui/components/ProductItem.vue
similarity index 88%
rename from src/components/ProductItem.vue
rename to src/ui/components/ProductItem.vue
index c963f03..24170e9 100644
--- a/src/components/ProductItem.vue
+++ b/src/ui/components/ProductItem.vue
@@ -58,15 +58,15 @@
 <script lang="ts">
 import { ref, computed, defineComponent } from "vue";
 
-import EVENT from "@/enums/event";
-import PRODUCT_CODE from "@/enums/product";
+import EVENT from "@/ui/types/event";
+import { PRODUCT_CODE } from "@/domain/checkout/checkout.types";
 
 import { Product } from "@/domain/checkout/checkout.types";
-import isValidProductCode from "@/utils/isValidProductCode";
+import isValidProductCode from "@/ui/utils/isValidProductCode";
 
-import ShopButton from "@/components/core/Button.vue";
-import ShopInputText from "@/components/core/InputText.vue";
-import ShopFigure from "@/components/core/Figure.vue";
+import ShopButton from "@/ui/components/core/Button.vue";
+import ShopInputText from "@/ui/components/core/InputText.vue";
+import ShopFigure from "@/ui/components/core/Figure.vue";
 
 const { ADD_PRODUCT, REMOVE_PRODUCT } = EVENT;
 
diff --git a/src/components/ProductList.vue b/src/ui/components/ProductList.vue
similarity index 83%
rename from src/components/ProductList.vue
rename to src/ui/components/ProductList.vue
index d23d069..72df17f 100644
--- a/src/components/ProductList.vue
+++ b/src/ui/components/ProductList.vue
@@ -12,8 +12,8 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import useShoppingProducts from "@/composable-functions/useShoppingProducts";
-import ProductItem from "@/components/ProductItem.vue";
+import useShoppingProducts from "@/application/services/useShoppingProducts";
+import ProductItem from "@/ui/components/ProductItem.vue";
 
 export default defineComponent({
   name: "ProductList",
diff --git a/src/components/SummaryDiscounts.vue b/src/ui/components/SummaryDiscounts.vue
similarity index 91%
rename from src/components/SummaryDiscounts.vue
rename to src/ui/components/SummaryDiscounts.vue
index 576ba72..c82b125 100644
--- a/src/components/SummaryDiscounts.vue
+++ b/src/ui/components/SummaryDiscounts.vue
@@ -12,7 +12,7 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import useShoppingSummary from "@/composable-functions/useShoppingSummary";
+import useShoppingSummary from "@/application/services/useShoppingSummary";
 
 export default defineComponent({
   name: "SummaryDiscounts",
diff --git a/src/components/SummaryItems.vue b/src/ui/components/SummaryItems.vue
similarity index 92%
rename from src/components/SummaryItems.vue
rename to src/ui/components/SummaryItems.vue
index 14d13b5..6b36445 100644
--- a/src/components/SummaryItems.vue
+++ b/src/ui/components/SummaryItems.vue
@@ -14,7 +14,7 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import useShoppingSummary from "@/composable-functions/useShoppingSummary";
+import useShoppingSummary from "@/application/services/useShoppingSummary";
 
 export default defineComponent({
   name: "SummaryItems",
diff --git a/src/components/SummaryTotal.vue b/src/ui/components/SummaryTotal.vue
similarity index 83%
rename from src/components/SummaryTotal.vue
rename to src/ui/components/SummaryTotal.vue
index 90b1df2..8771c65 100644
--- a/src/components/SummaryTotal.vue
+++ b/src/ui/components/SummaryTotal.vue
@@ -24,11 +24,11 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import Modal from "@/components/Modal.vue";
-import ShopButton from "@/components/core/Button.vue";
-import Checkout from "@/components/Checkout.vue";
-import useModal from "@/composable-functions/useModal";
-import useShoppingSummary from "@/composable-functions/useShoppingSummary";
+import Modal from "@/ui/components/Modal.vue";
+import ShopButton from "@/ui/components/core/Button.vue";
+import Checkout from "@/ui/components/Checkout.vue";
+import useModal from "@/application/services/useModal";
+import useShoppingSummary from "@/application/services/useShoppingSummary";
 
 export default defineComponent({
   name: "SummaryTotal",
diff --git a/src/components/Title.vue b/src/ui/components/Title.vue
similarity index 100%
rename from src/components/Title.vue
rename to src/ui/components/Title.vue
diff --git a/src/components/core/Button.vue b/src/ui/components/core/Button.vue
similarity index 100%
rename from src/components/core/Button.vue
rename to src/ui/components/core/Button.vue
diff --git a/src/components/core/Figure.vue b/src/ui/components/core/Figure.vue
similarity index 100%
rename from src/components/core/Figure.vue
rename to src/ui/components/core/Figure.vue
diff --git a/src/components/core/InputText.vue b/src/ui/components/core/InputText.vue
similarity index 100%
rename from src/components/core/InputText.vue
rename to src/ui/components/core/InputText.vue
diff --git a/src/enums/event.ts b/src/ui/types/event.ts
similarity index 100%
rename from src/enums/event.ts
rename to src/ui/types/event.ts
diff --git a/src/utils/isValidProductCode.ts b/src/ui/utils/isValidProductCode.ts
similarity index 79%
rename from src/utils/isValidProductCode.ts
rename to src/ui/utils/isValidProductCode.ts
index 6db3202..dfb53ee 100644
--- a/src/utils/isValidProductCode.ts
+++ b/src/ui/utils/isValidProductCode.ts
@@ -1,4 +1,4 @@
-import PRODUCT_CODE from "@/enums/product";
+import { PRODUCT_CODE } from "@/domain/checkout/checkout.types";
 
 /**
  * Validate the product code
diff --git a/src/views/Products.vue b/src/ui/views/Products.vue
similarity index 85%
rename from src/views/Products.vue
rename to src/ui/views/Products.vue
index 7e435b2..6b09456 100644
--- a/src/views/Products.vue
+++ b/src/ui/views/Products.vue
@@ -8,9 +8,9 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import Title from "@/components/Title.vue";
-import ProductHead from "@/components/ProductHead.vue";
-import ProductList from "@/components/ProductList.vue";
+import Title from "@/ui/components/Title.vue";
+import ProductHead from "@/ui/components/ProductHead.vue";
+import ProductList from "@/ui/components/ProductList.vue";
 
 export default defineComponent({
   name: "Products",
diff --git a/src/views/Summary.vue b/src/ui/views/Summary.vue
similarity index 75%
rename from src/views/Summary.vue
rename to src/ui/views/Summary.vue
index 4f6bf21..91dda01 100644
--- a/src/views/Summary.vue
+++ b/src/ui/views/Summary.vue
@@ -9,10 +9,10 @@
 
 <script lang="ts">
 import { defineComponent } from "vue";
-import Title from "@/components/Title.vue";
-import SummaryItems from "@/components/SummaryItems.vue";
-import SummaryDiscounts from "@/components/SummaryDiscounts.vue";
-import SummaryTotal from "@/components/SummaryTotal.vue";
+import Title from "@/ui/components/Title.vue";
+import SummaryItems from "@/ui/components/SummaryItems.vue";
+import SummaryDiscounts from "@/ui/components/SummaryDiscounts.vue";
+import SummaryTotal from "@/ui/components/SummaryTotal.vue";
 
 export default defineComponent({
   name: "Summary",
diff --git a/tests/unit/mocks/mockContext.ts b/tests/unit/_mocks/mockContext.ts
similarity index 84%
rename from tests/unit/mocks/mockContext.ts
rename to tests/unit/_mocks/mockContext.ts
index ced71e8..df1b8f6 100644
--- a/tests/unit/mocks/mockContext.ts
+++ b/tests/unit/_mocks/mockContext.ts
@@ -1,4 +1,4 @@
-import { StateRoot } from "@/store/types";
+import { StateRoot } from "@/infrastructure/store/store.types";
 import { ActionContext } from "vuex";
 import mockShoppingState from "./mockShoppingState";
 
diff --git a/tests/unit/mocks/mockPrincingRules.ts b/tests/unit/_mocks/mockPrincingRules.ts
similarity index 72%
rename from tests/unit/mocks/mockPrincingRules.ts
rename to tests/unit/_mocks/mockPrincingRules.ts
index 83df5ef..7a66eae 100644
--- a/tests/unit/mocks/mockPrincingRules.ts
+++ b/tests/unit/_mocks/mockPrincingRules.ts
@@ -1,5 +1,5 @@
-import PRODUCT_CODE from "@/enums/product";
-import DISCOUNT_CODE from "@/enums/discount";
+import { PRODUCT_CODE } from "@/domain/checkout/checkout.types";
+import { DISCOUNT_CODE } from "@/domain/discount-rules/discount.rules.types";
 
 const { CAP, TSHIRT, MUG } = PRODUCT_CODE;
 const { TWO_X_ONE, BULK } = DISCOUNT_CODE;
diff --git a/tests/unit/mocks/mockShoppingState.ts b/tests/unit/_mocks/mockShoppingState.ts
similarity index 82%
rename from tests/unit/mocks/mockShoppingState.ts
rename to tests/unit/_mocks/mockShoppingState.ts
index 3111872..c17c31d 100644
--- a/tests/unit/mocks/mockShoppingState.ts
+++ b/tests/unit/_mocks/mockShoppingState.ts
@@ -1,6 +1,6 @@
-import PRODUCT_CODE from "@/enums/product";
-import DISCOUNT_CODE from "@/enums/discount";
-import { StateRoot } from "@/store/types";
+import { PRODUCT_CODE } from "@/domain/checkout/checkout.types";
+import { DISCOUNT_CODE } from "@/domain/discount-rules/discount.rules.types";
+import { StateRoot } from "@/infrastructure/store/store.types";
 
 const { CAP, TSHIRT, MUG } = PRODUCT_CODE;
 const { TWO_X_ONE, BULK } = DISCOUNT_CODE;
diff --git a/tests/unit/mocks/mockStore.ts b/tests/unit/_mocks/mockStore.ts
similarity index 72%
rename from tests/unit/mocks/mockStore.ts
rename to tests/unit/_mocks/mockStore.ts
index 9f68742..14f9daf 100644
--- a/tests/unit/mocks/mockStore.ts
+++ b/tests/unit/_mocks/mockStore.ts
@@ -1,4 +1,4 @@
-import Shopping from "@/store/shopping";
+import Shopping from "@/infrastructure/store/shopping";
 import mockShoppingState from "./mockShoppingState";
 
 const mockStore = {
diff --git a/tests/unit/domain/checkout-promotions.spec.ts b/tests/unit/domain/checkout-promotions.spec.ts
index 63ff1d8..a320068 100644
--- a/tests/unit/domain/checkout-promotions.spec.ts
+++ b/tests/unit/domain/checkout-promotions.spec.ts
@@ -1,8 +1,8 @@
-import PRODUCT_CODE from "@/enums/product";
+import { PRODUCT_CODE } from "@/domain/checkout/checkout.types";
 import { DiscountRule } from "@/domain/discount-rules/discount.rules.types";
 
 import CheckoutService from "@/domain/checkout/checkout.service";
-import mockPrincingRules from "../mocks/mockPrincingRules";
+import mockPrincingRules from "../_mocks/mockPrincingRules";
 import DiscountRulesService from "@/domain/discount-rules/discount.rules.service";
 
 const { CAP, TSHIRT } = PRODUCT_CODE;
diff --git a/tests/unit/domain/checkout-total-cost.spec.ts b/tests/unit/domain/checkout-total-cost.spec.ts
index aff9f43..036fbeb 100644
--- a/tests/unit/domain/checkout-total-cost.spec.ts
+++ b/tests/unit/domain/checkout-total-cost.spec.ts
@@ -1,8 +1,8 @@
-import PRODUCT_CODE from "@/enums/product";
+import { PRODUCT_CODE } from "@/domain/checkout/checkout.types";
 import { DiscountRule } from "@/domain/discount-rules/discount.rules.types";
 
 import CheckoutService from "@/domain/checkout/checkout.service";
-import mockPrincingRules from "../mocks/mockPrincingRules";
+import mockPrincingRules from "../_mocks/mockPrincingRules";
 import DiscountRulesService from "@/domain/discount-rules/discount.rules.service";
 
 const { CAP, TSHIRT, MUG } = PRODUCT_CODE;
diff --git a/tests/unit/domain/checkout-total-items.spec.ts b/tests/unit/domain/checkout-total-items.spec.ts
index 8ced6d1..c201c9e 100644
--- a/tests/unit/domain/checkout-total-items.spec.ts
+++ b/tests/unit/domain/checkout-total-items.spec.ts
@@ -1,8 +1,8 @@
-import PRODUCT_CODE from "@/enums/product";
+import { PRODUCT_CODE } from "@/domain/checkout/checkout.types";
 import { DiscountRule } from "@/domain/discount-rules/discount.rules.types";
 
 import CheckoutService from "@/domain/checkout/checkout.service";
-import mockPrincingRules from "../mocks/mockPrincingRules";
+import mockPrincingRules from "../_mocks/mockPrincingRules";
 import DiscountRulesService from "@/domain/discount-rules/discount.rules.service";
 
 const { CAP, TSHIRT, MUG } = PRODUCT_CODE;
diff --git a/tests/unit/store/shopping/actions.spec.ts b/tests/unit/infrastructure/store/shopping/actions.spec.ts
similarity index 84%
rename from tests/unit/store/shopping/actions.spec.ts
rename to tests/unit/infrastructure/store/shopping/actions.spec.ts
index e136586..78b5fd2 100644
--- a/tests/unit/store/shopping/actions.spec.ts
+++ b/tests/unit/infrastructure/store/shopping/actions.spec.ts
@@ -1,8 +1,9 @@
-import PRODUCT_CODE from "@/enums/product";
-import { MUTATION } from "@/enums/shopping";
-import actions from "@/store/shopping/actions";
+import actions from "@/infrastructure/store/shopping/actions";
 
-import mockContext from "../../mocks/mockContext";
+import { PRODUCT_CODE } from "@/domain/checkout/checkout.types";
+import { MUTATION } from "@/infrastructure/store/shopping/shopping.types";
+
+import mockContext from "../../../_mocks/mockContext";
 
 const {
   SAVE_TOTAL_COST,
diff --git a/tests/unit/store/shopping/getters.spec.ts b/tests/unit/infrastructure/store/shopping/getters.spec.ts
similarity index 90%
rename from tests/unit/store/shopping/getters.spec.ts
rename to tests/unit/infrastructure/store/shopping/getters.spec.ts
index 23c436d..b717deb 100644
--- a/tests/unit/store/shopping/getters.spec.ts
+++ b/tests/unit/infrastructure/store/shopping/getters.spec.ts
@@ -1,6 +1,6 @@
-import { StateRoot } from "@/store/types";
-import getters from "@/store/shopping/getters";
-import mockState from "../../mocks/mockShoppingState";
+import { StateRoot } from "@/infrastructure/store/store.types";
+import getters from "@/infrastructure/store/shopping/getters";
+import mockState from "../../../_mocks/mockShoppingState";
 
 describe("Shopping store - Getters", () => {
   let stateRoot: StateRoot;
diff --git a/tests/unit/store/shopping/intialState.spec.ts b/tests/unit/infrastructure/store/shopping/intialState.spec.ts
similarity index 78%
rename from tests/unit/store/shopping/intialState.spec.ts
rename to tests/unit/infrastructure/store/shopping/intialState.spec.ts
index e849e56..1bd5a81 100644
--- a/tests/unit/store/shopping/intialState.spec.ts
+++ b/tests/unit/infrastructure/store/shopping/intialState.spec.ts
@@ -1,4 +1,4 @@
-import initialState from "@/store/shopping/initialState";
+import initialState from "@/infrastructure/store/shopping/initialState";
 
 it("Shooping store - Initial state", () => {
   const expected = {
diff --git a/tests/unit/store/shopping/mutations.spec.ts b/tests/unit/infrastructure/store/shopping/mutations.spec.ts
similarity index 81%
rename from tests/unit/store/shopping/mutations.spec.ts
rename to tests/unit/infrastructure/store/shopping/mutations.spec.ts
index f157ad7..7b58bb5 100644
--- a/tests/unit/store/shopping/mutations.spec.ts
+++ b/tests/unit/infrastructure/store/shopping/mutations.spec.ts
@@ -1,8 +1,8 @@
-import { StateRoot } from "@/store/types";
-import PRODUCT_CODE from "@/enums/product";
-import DISCOUNT_CODE from "@/enums/discount";
-import mutations from "@/store/shopping/mutations";
-import mockState from "../../mocks/mockShoppingState";
+import { StateRoot } from "@/infrastructure/store/store.types";
+import { PRODUCT_CODE } from "@/domain/checkout/checkout.types";
+import { DISCOUNT_CODE } from "@/domain/discount-rules/discount.rules.types";
+import mutations from "@/infrastructure/store/shopping/mutations";
+import mockState from "../../../_mocks/mockShoppingState";
 
 const { CAP } = PRODUCT_CODE;
 const { TWO_X_ONE, BULK } = DISCOUNT_CODE;
diff --git a/tests/unit/components/ProductItem.spec.ts b/tests/unit/ui/components/ProductItem.spec.ts
similarity index 98%
rename from tests/unit/components/ProductItem.spec.ts
rename to tests/unit/ui/components/ProductItem.spec.ts
index c542911..3ec5a33 100644
--- a/tests/unit/components/ProductItem.spec.ts
+++ b/tests/unit/ui/components/ProductItem.spec.ts
@@ -1,5 +1,5 @@
 import { render, fireEvent } from "@testing-library/vue";
-import ProductItem from "@/components/ProductItem.vue";
+import ProductItem from "@/ui/components/ProductItem.vue";
 
 describe("ProductItem.vue", () => {
   it("Render product image", () => {
diff --git a/tests/unit/components/ProductList.spec.ts b/tests/unit/ui/components/ProductList.spec.ts
similarity index 64%
rename from tests/unit/components/ProductList.spec.ts
rename to tests/unit/ui/components/ProductList.spec.ts
index 02534c3..d50dd79 100644
--- a/tests/unit/components/ProductList.spec.ts
+++ b/tests/unit/ui/components/ProductList.spec.ts
@@ -1,5 +1,5 @@
-import renderComponent from "../utils/renderComponent";
-import ProductList from "@/components/ProductList.vue";
+import renderComponent from "../helpers/renderComponent";
+import ProductList from "@/ui/components/ProductList.vue";
 
 describe("ProductList.vue", () => {
   it("Must render the products", () => {
diff --git a/tests/unit/components/SummaryDiscounts.spec.ts b/tests/unit/ui/components/SummaryDiscounts.spec.ts
similarity index 69%
rename from tests/unit/components/SummaryDiscounts.spec.ts
rename to tests/unit/ui/components/SummaryDiscounts.spec.ts
index d4524df..d3703fc 100644
--- a/tests/unit/components/SummaryDiscounts.spec.ts
+++ b/tests/unit/ui/components/SummaryDiscounts.spec.ts
@@ -1,5 +1,5 @@
-import renderComponent from "../utils/renderComponent";
-import SummaryDiscounts from "@/components/SummaryDiscounts.vue";
+import renderComponent from "../helpers/renderComponent";
+import SummaryDiscounts from "@/ui/components/SummaryDiscounts.vue";
 
 describe("SummaryDiscounts.vue", () => {
   it("Must display the list of discounts", () => {
diff --git a/tests/unit/components/SummaryItems.spec.ts b/tests/unit/ui/components/SummaryItems.spec.ts
similarity index 77%
rename from tests/unit/components/SummaryItems.spec.ts
rename to tests/unit/ui/components/SummaryItems.spec.ts
index b0d63f8..232418e 100644
--- a/tests/unit/components/SummaryItems.spec.ts
+++ b/tests/unit/ui/components/SummaryItems.spec.ts
@@ -1,5 +1,5 @@
-import renderComponent from "../utils/renderComponent";
-import SummaryItems from "@/components/SummaryItems.vue";
+import renderComponent from "../helpers/renderComponent";
+import SummaryItems from "@/ui/components/SummaryItems.vue";
 
 describe("SummaryItems.vue", () => {
   it("Must display the total items", () => {
diff --git a/tests/unit/components/SummaryTotal.spec.ts b/tests/unit/ui/components/SummaryTotal.spec.ts
similarity index 65%
rename from tests/unit/components/SummaryTotal.spec.ts
rename to tests/unit/ui/components/SummaryTotal.spec.ts
index a6d1192..7bf2a3d 100644
--- a/tests/unit/components/SummaryTotal.spec.ts
+++ b/tests/unit/ui/components/SummaryTotal.spec.ts
@@ -1,5 +1,5 @@
-import SummaryTotal from "@/components/SummaryTotal.vue";
-import renderComponent from "../utils/renderComponent";
+import SummaryTotal from "@/ui/components/SummaryTotal.vue";
+import renderComponent from "../helpers/renderComponent";
 
 describe("SummaryTotal.vue", () => {
   it("Must display the total cost with discounts", () => {
diff --git a/tests/unit/ui/helpers/createStore.ts b/tests/unit/ui/helpers/createStore.ts
new file mode 100644
index 0000000..92e4929
--- /dev/null
+++ b/tests/unit/ui/helpers/createStore.ts
@@ -0,0 +1,7 @@
+import { createStore } from "vuex";
+import { StateRoot } from "@/infrastructure/store/store.types";
+import mockStore from "../../_mocks/mockStore";
+
+const store = createStore<StateRoot>(mockStore);
+
+export default store;
diff --git a/tests/unit/utils/renderComponent.ts b/tests/unit/ui/helpers/renderComponent.ts
similarity index 78%
rename from tests/unit/utils/renderComponent.ts
rename to tests/unit/ui/helpers/renderComponent.ts
index 8bd657e..0898777 100644
--- a/tests/unit/utils/renderComponent.ts
+++ b/tests/unit/ui/helpers/renderComponent.ts
@@ -1,8 +1,8 @@
 import { DefineComponent } from "@vue/runtime-dom";
 import { render, RenderResult } from "@testing-library/vue";
 
-import { key } from "@/store";
-import store from "../utils/createStore";
+import { key } from "@/infrastructure/store";
+import store from "./createStore";
 
 export default function renderComponent(
   component: DefineComponent
diff --git a/tests/unit/views/Products.spec.ts b/tests/unit/ui/views/Products.spec.ts
similarity index 72%
rename from tests/unit/views/Products.spec.ts
rename to tests/unit/ui/views/Products.spec.ts
index 13ef43d..c3f2821 100644
--- a/tests/unit/views/Products.spec.ts
+++ b/tests/unit/ui/views/Products.spec.ts
@@ -1,8 +1,8 @@
 import { shallowMount } from "@vue/test-utils";
-import Products from "@/views/Products.vue";
-import Title from "@/components/Title.vue";
-import ProductHead from "@/components/ProductHead.vue";
-import ProductList from "@/components/ProductList.vue";
+import Products from "@/ui/views/Products.vue";
+import Title from "@/ui/components/Title.vue";
+import ProductHead from "@/ui/components/ProductHead.vue";
+import ProductList from "@/ui/components/ProductList.vue";
 
 describe("Products.vue", () => {
   it("Must use Title component", () => {
diff --git a/tests/unit/views/Summary.spec.ts b/tests/unit/ui/views/Summary.spec.ts
similarity index 72%
rename from tests/unit/views/Summary.spec.ts
rename to tests/unit/ui/views/Summary.spec.ts
index 49ca2bf..0c92424 100644
--- a/tests/unit/views/Summary.spec.ts
+++ b/tests/unit/ui/views/Summary.spec.ts
@@ -1,9 +1,9 @@
 import { shallowMount } from "@vue/test-utils";
-import Summary from "@/views/Summary.vue";
-import Title from "@/components/Title.vue";
-import SummaryItems from "@/components/SummaryItems.vue";
-import SummaryDiscounts from "@/components/SummaryDiscounts.vue";
-import SummaryTotal from "@/components/SummaryTotal.vue";
+import Summary from "@/ui/views/Summary.vue";
+import Title from "@/ui/components/Title.vue";
+import SummaryItems from "@/ui/components/SummaryItems.vue";
+import SummaryDiscounts from "@/ui/components/SummaryDiscounts.vue";
+import SummaryTotal from "@/ui/components/SummaryTotal.vue";
 
 describe("Summary.vue", () => {
   it("Must use Title component", () => {
diff --git a/tests/unit/utils/createStore.ts b/tests/unit/utils/createStore.ts
deleted file mode 100644
index f9e4e35..0000000
--- a/tests/unit/utils/createStore.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { createStore } from "vuex";
-import { StateRoot } from "@/store/types";
-import mockStore from "../mocks/mockStore";
-
-const store = createStore<StateRoot>(mockStore);
-
-export default store;