diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..642755d
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,24 @@
+name: Build
+
+on: push
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [20]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
+        with:
+          version: 8
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm install --ignore-scripts
+      - name: Run Build
+        run: pnpm run build
diff --git a/.github/workflows/lint-bun.yml b/.github/workflows/lint-bun.yml
index 8487718..3e40ac0 100644
--- a/.github/workflows/lint-bun.yml
+++ b/.github/workflows/lint-bun.yml
@@ -5,9 +5,6 @@ on: push
 jobs:
   eslint:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [18]
     steps:
       - uses: actions/checkout@v3
       - uses: oven-sh/setup-bun@v1
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 16af9e1..5f0e3f0 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [18]
+        node-version: [20]
     steps:
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2
diff --git a/app/components/Table/Table.tsx b/app/components/Table/Table.tsx
index 797ad4f..e207f21 100644
--- a/app/components/Table/Table.tsx
+++ b/app/components/Table/Table.tsx
@@ -6,7 +6,7 @@ import { ArrowTopRightOnSquareIcon } from '@heroicons/react/24/outline';
 import { getFlagByCountryName } from '@/helpers/getEmojiFlagByISO';
 // import { toLamaCase } from './toLamaCase';
 
-import '@/components/helpers.css';
+import '@/helpers/helpers.css';
 import styles from './table.module.css';
 
 interface TableProps {
diff --git a/app/components/Grid.css b/app/components/layout/grid.module.css
similarity index 100%
rename from app/components/Grid.css
rename to app/components/layout/grid.module.css
diff --git a/app/components/Helpers.css b/app/helpers/helpers.css
similarity index 100%
rename from app/components/Helpers.css
rename to app/helpers/helpers.css
diff --git a/app/manufacturers/[id]/page.tsx b/app/manufacturers/[id]/page.tsx
index cee6ded..8afffb4 100644
--- a/app/manufacturers/[id]/page.tsx
+++ b/app/manufacturers/[id]/page.tsx
@@ -1,7 +1,9 @@
+import styles from '@/components/layout/grid.module.css';
+
 const Manufacturer = ({ params }: { params: { id: string } }) => {
 
   return (
-    <main className="container">
+    <main className={styles.container}>
       <h1>{ params.id }</h1>
     </main>
   );
diff --git a/app/page.tsx b/app/page.tsx
index a8c56f8..174b560 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -1,15 +1,15 @@
 // import { useEffect, useState } from 'react';
 
-import Table from '@/components/Table';
+import Table from '@/components/table';
 import { getManufacturers } from './api';
 
-import '@/components/grid.css';
+import styles from '@/components/layout/grid.module.css';
 
 const HomePage = async () => {
   const manufacturers = await getManufacturers().then((data) => data.Results);
 
   return (
-    <main className="container">
+    <main className={styles.container}>
       <Table manufacturers={manufacturers} />
     </main>
   );