diff --git a/app/[locale]/ajouter-un-tournoi/Map.tsx b/app/[locale]/ajouter-un-tournoi/Map.tsx
index 1356177..3cd66b4 100644
--- a/app/[locale]/ajouter-un-tournoi/Map.tsx
+++ b/app/[locale]/ajouter-un-tournoi/Map.tsx
@@ -10,8 +10,8 @@ import "leaflet/dist/leaflet.css";
 import { useFormContext, useWatch } from "react-hook-form";
 import { MapContainer, Marker, TileLayer } from "react-leaflet";
 
-import MapEvents from "@/app/[locale]/components/MapEvents";
 import { mapBoundsAtom } from "@/app/atoms";
+import MapEvents from "@/components/MapEvents";
 
 const center: LatLngLiteral = { lat: 47.0844, lng: 2.3964 };
 
diff --git a/app/[locale]/ajouter-un-tournoi/TournamentForm.tsx b/app/[locale]/ajouter-un-tournoi/TournamentForm.tsx
index fcce381..859c0a5 100644
--- a/app/[locale]/ajouter-un-tournoi/TournamentForm.tsx
+++ b/app/[locale]/ajouter-un-tournoi/TournamentForm.tsx
@@ -8,14 +8,14 @@ import dynamic from "next/dynamic";
 import { FormProvider, useForm } from "react-hook-form";
 import { z } from "zod";
 
-import { clearMessage } from "@/app/[locale]/components/InfoMessage";
-import InfoMessage from "@/app/[locale]/components/InfoMessage";
-import LoadingMap from "@/app/[locale]/components/LoadingMap";
-import { DateField } from "@/app/[locale]/components/form/DateField";
-import { SelectField } from "@/app/[locale]/components/form/SelectField";
-import { SwitchField } from "@/app/[locale]/components/form/SwitchField";
-import { TextAreaField } from "@/app/[locale]/components/form/TextAreaField";
-import { TextField } from "@/app/[locale]/components/form/TextField";
+import { clearMessage } from "@/components/InfoMessage";
+import InfoMessage from "@/components/InfoMessage";
+import LoadingMap from "@/components/LoadingMap";
+import { DateField } from "@/components/form/DateField";
+import { SelectField } from "@/components/form/SelectField";
+import { SwitchField } from "@/components/form/SwitchField";
+import { TextAreaField } from "@/components/form/TextAreaField";
+import { TextField } from "@/components/form/TextField";
 import { addTournamentSchema } from "@/schemas";
 import { TimeControl } from "@/types";
 import { trpc } from "@/utils/trpc";
diff --git a/app/[locale]/components/Footer.tsx b/app/[locale]/components/Footer.tsx
index 44c50f9..a0d385a 100644
--- a/app/[locale]/components/Footer.tsx
+++ b/app/[locale]/components/Footer.tsx
@@ -2,7 +2,7 @@ import { useTranslations } from "next-intl";
 import Link from "next-intl/link";
 import { FaGithub, FaRegEnvelope } from "react-icons/fa";
 
-import ThemeSwitcher from "@/app/[locale]/components/ThemeSwitcher";
+import ThemeSwitcher from "./ThemeSwitcher";
 
 export default function Footer() {
   const t = useTranslations("Footer");
diff --git a/app/[locale]/contactez-nous/ContactForm.tsx b/app/[locale]/contactez-nous/ContactForm.tsx
index 16d2799..f2386ae 100644
--- a/app/[locale]/contactez-nous/ContactForm.tsx
+++ b/app/[locale]/contactez-nous/ContactForm.tsx
@@ -4,7 +4,7 @@ import { useState } from "react";
 
 import { useTranslations } from "next-intl";
 
-import InfoMessage from "@/app/[locale]/components/InfoMessage";
+import InfoMessage from "@/components/InfoMessage";
 import { handleEmailSubmit } from "@/handlers/formHandlers";
 import useContactForm from "@/hooks/useContactForm";
 
diff --git a/app/[locale]/tournois/TournamentMap.tsx b/app/[locale]/tournois/TournamentMap.tsx
index d1ca74e..afff505 100644
--- a/app/[locale]/tournois/TournamentMap.tsx
+++ b/app/[locale]/tournois/TournamentMap.tsx
@@ -13,7 +13,6 @@ import { FaAngleDoubleDown } from "react-icons/fa";
 import { LayerGroup, MapContainer, TileLayer } from "react-leaflet";
 import MarkerClusterGroup from "react-leaflet-cluster";
 
-import MapEvents from "@/app/[locale]/components/MapEvents";
 import {
   debouncedHoveredListTournamentIdAtom,
   filteredTournamentsByTimeControlAtom,
@@ -21,6 +20,7 @@ import {
   normsOnlyAtom,
 } from "@/app/atoms";
 import { TimeControlColours } from "@/app/constants";
+import MapEvents from "@/components/MapEvents";
 import { generatePieSVG } from "@/lib/pie";
 import { TimeControl } from "@/types";
 
diff --git a/app/[locale]/tournois/TournamentsDisplay.tsx b/app/[locale]/tournois/TournamentsDisplay.tsx
index 04ceb62..c918d6e 100644
--- a/app/[locale]/tournois/TournamentsDisplay.tsx
+++ b/app/[locale]/tournois/TournamentsDisplay.tsx
@@ -3,8 +3,8 @@
 import { useHydrateAtoms } from "jotai/utils";
 import dynamic from "next/dynamic";
 
-import LoadingMap from "@/app/[locale]/components/LoadingMap";
 import { tournamentsAtom } from "@/app/atoms";
+import LoadingMap from "@/components/LoadingMap";
 import { Tournament } from "@/types";
 
 import TournamentTable from "./TournamentTable";
diff --git a/app/[locale]/components/InfoMessage.tsx b/components/InfoMessage.tsx
similarity index 100%
rename from app/[locale]/components/InfoMessage.tsx
rename to components/InfoMessage.tsx
diff --git a/app/[locale]/components/LoadingMap.tsx b/components/LoadingMap.tsx
similarity index 100%
rename from app/[locale]/components/LoadingMap.tsx
rename to components/LoadingMap.tsx
diff --git a/app/[locale]/components/MapEvents.tsx b/components/MapEvents.tsx
similarity index 100%
rename from app/[locale]/components/MapEvents.tsx
rename to components/MapEvents.tsx
diff --git a/app/[locale]/components/form/DateField/components/DatePickerCustomHeader.tsx b/components/form/DateField/components/DatePickerCustomHeader.tsx
similarity index 100%
rename from app/[locale]/components/form/DateField/components/DatePickerCustomHeader.tsx
rename to components/form/DateField/components/DatePickerCustomHeader.tsx
diff --git a/app/[locale]/components/form/DateField/components/InputDatePicker.tsx b/components/form/DateField/components/InputDatePicker.tsx
similarity index 100%
rename from app/[locale]/components/form/DateField/components/InputDatePicker.tsx
rename to components/form/DateField/components/InputDatePicker.tsx
diff --git a/app/[locale]/components/form/DateField/components/index.ts b/components/form/DateField/components/index.ts
similarity index 100%
rename from app/[locale]/components/form/DateField/components/index.ts
rename to components/form/DateField/components/index.ts
diff --git a/app/[locale]/components/form/DateField/index.tsx b/components/form/DateField/index.tsx
similarity index 100%
rename from app/[locale]/components/form/DateField/index.tsx
rename to components/form/DateField/index.tsx
diff --git a/app/[locale]/components/form/ErrorMessage.tsx b/components/form/ErrorMessage.tsx
similarity index 100%
rename from app/[locale]/components/form/ErrorMessage.tsx
rename to components/form/ErrorMessage.tsx
diff --git a/app/[locale]/components/form/Field.tsx b/components/form/Field.tsx
similarity index 100%
rename from app/[locale]/components/form/Field.tsx
rename to components/form/Field.tsx
diff --git a/app/[locale]/components/form/Label.tsx b/components/form/Label.tsx
similarity index 100%
rename from app/[locale]/components/form/Label.tsx
rename to components/form/Label.tsx
diff --git a/app/[locale]/components/form/SelectField.tsx b/components/form/SelectField.tsx
similarity index 100%
rename from app/[locale]/components/form/SelectField.tsx
rename to components/form/SelectField.tsx
diff --git a/app/[locale]/components/form/SwitchField.tsx b/components/form/SwitchField.tsx
similarity index 100%
rename from app/[locale]/components/form/SwitchField.tsx
rename to components/form/SwitchField.tsx
diff --git a/app/[locale]/components/form/TextAreaField.tsx b/components/form/TextAreaField.tsx
similarity index 100%
rename from app/[locale]/components/form/TextAreaField.tsx
rename to components/form/TextAreaField.tsx
diff --git a/app/[locale]/components/form/TextField.tsx b/components/form/TextField.tsx
similarity index 100%
rename from app/[locale]/components/form/TextField.tsx
rename to components/form/TextField.tsx
diff --git a/handlers/formHandlers.ts b/handlers/formHandlers.ts
index 1d2d809..f8e4b11 100644
--- a/handlers/formHandlers.ts
+++ b/handlers/formHandlers.ts
@@ -2,7 +2,7 @@ import { Dispatch, FormEvent, SetStateAction } from "react";
 
 import { useTranslations } from "next-intl";
 
-import { clearMessage } from "@/app/[locale]/components/InfoMessage";
+import { clearMessage } from "@/components/InfoMessage";
 import sendMail from "@/lib/sendMail";
 import { ResponseMessage } from "@/types";
 import { errorLog } from "@/utils/logger";