diff --git a/bot/application/student/exceptions/invalid_discord_id_format_exception.py b/bot/application/student/exception/invalid_discord_id_format_exception.py
similarity index 76%
rename from bot/application/student/exceptions/invalid_discord_id_format_exception.py
rename to bot/application/student/exception/invalid_discord_id_format_exception.py
index 889cdf7..f5faf5a 100644
--- a/bot/application/student/exceptions/invalid_discord_id_format_exception.py
+++ b/bot/application/student/exception/invalid_discord_id_format_exception.py
@@ -1,4 +1,4 @@
-from bot.application.student.exceptions.invalid_format_exception import (
+from bot.application.student.exception.invalid_format_exception import (
     InvalidFormatException,
 )
 
diff --git a/bot/application/student/exceptions/invalid_format_exception.py b/bot/application/student/exception/invalid_format_exception.py
similarity index 100%
rename from bot/application/student/exceptions/invalid_format_exception.py
rename to bot/application/student/exception/invalid_format_exception.py
diff --git a/bot/application/student/exceptions/invalid_name_format_exception.py b/bot/application/student/exception/invalid_name_format_exception.py
similarity index 100%
rename from bot/application/student/exceptions/invalid_name_format_exception.py
rename to bot/application/student/exception/invalid_name_format_exception.py
diff --git a/bot/application/student/exceptions/invalid_ni_format_exception.py b/bot/application/student/exception/invalid_ni_format_exception.py
similarity index 81%
rename from bot/application/student/exceptions/invalid_ni_format_exception.py
rename to bot/application/student/exception/invalid_ni_format_exception.py
index 7d2204f..bd0fbeb 100644
--- a/bot/application/student/exceptions/invalid_ni_format_exception.py
+++ b/bot/application/student/exception/invalid_ni_format_exception.py
@@ -1,6 +1,6 @@
 from typing import Union
 
-from bot.application.student.exceptions.invalid_format_exception import (
+from bot.application.student.exception.invalid_format_exception import (
     InvalidFormatException,
 )
 from bot.domain.student.attribut.ni import NI
diff --git a/bot/application/student/exceptions/missing_program_code_exception.py b/bot/application/student/exception/missing_program_code_exception.py
similarity index 100%
rename from bot/application/student/exceptions/missing_program_code_exception.py
rename to bot/application/student/exception/missing_program_code_exception.py
diff --git a/bot/application/student/exceptions/student_already_exist.py b/bot/application/student/exception/student_already_exist.py
similarity index 100%
rename from bot/application/student/exceptions/student_already_exist.py
rename to bot/application/student/exception/student_already_exist.py
diff --git a/bot/application/student/exceptions/student_already_registered_exception.py b/bot/application/student/exception/student_already_registered_exception.py
similarity index 100%
rename from bot/application/student/exceptions/student_already_registered_exception.py
rename to bot/application/student/exception/student_already_registered_exception.py
diff --git a/bot/application/student/student_service.py b/bot/application/student/student_service.py
index 713056b..78a21d8 100644
--- a/bot/application/student/student_service.py
+++ b/bot/application/student/student_service.py
@@ -8,10 +8,10 @@
 from bot.application.discord.event.student_registered.student_registered_observable import (
     StudentRegisteredObservable,
 )
-from bot.application.student.exceptions.student_already_exist import (
+from bot.application.student.exception.student_already_exist import (
     StudentAlreadyExistsException,
 )
-from bot.application.student.exceptions.student_already_registered_exception import (
+from bot.application.student.exception.student_already_registered_exception import (
     StudentAlreadyRegisteredException,
 )
 from bot.config.logger.logger import Logger
diff --git a/bot/config/environment/context/application_context.py b/bot/config/environment/context/application_context.py
index b7cb2ee..eb5f6ec 100644
--- a/bot/config/environment/context/application_context.py
+++ b/bot/config/environment/context/application_context.py
@@ -6,13 +6,13 @@
 from pymongo.collection import Collection
 
 from bot.application.discord.discord_service import DiscordService
-from bot.application.student.exceptions.invalid_format_exception import (
+from bot.application.student.exception.invalid_format_exception import (
     InvalidFormatException,
 )
-from bot.application.student.exceptions.student_already_exist import (
+from bot.application.student.exception.student_already_exist import (
     StudentAlreadyExistsException,
 )
-from bot.application.student.exceptions.student_already_registered_exception import (
+from bot.application.student.exception.student_already_registered_exception import (
     StudentAlreadyRegisteredException,
 )
 from bot.application.student.student_service import StudentService
diff --git a/bot/resource/cog/registration/factory/add_student_request_factory.py b/bot/resource/cog/registration/factory/add_student_request_factory.py
index 81c0dde..0512293 100644
--- a/bot/resource/cog/registration/factory/add_student_request_factory.py
+++ b/bot/resource/cog/registration/factory/add_student_request_factory.py
@@ -1,19 +1,19 @@
 import re
 from typing import Tuple
 
-from bot.application.student.exceptions.invalid_name_format_exception import (
+from bot.application.student.exception.invalid_name_format_exception import (
     InvalidNameFormatException,
 )
-from bot.application.student.exceptions.invalid_ni_format_exception import (
+from bot.application.student.exception.invalid_ni_format_exception import (
     InvalidNIFormatException,
 )
-from bot.application.student.exceptions.missing_program_code_exception import (
+from bot.application.student.exception.missing_program_code_exception import (
     MissingProgramCodeException,
 )
-from bot.resource.cog.validators.discord_id_validator import DiscordIdValidator
-from bot.resource.cog.validators.name_validator import NameValidator
-from bot.resource.cog.validators.ni_validator import NIValidator
-from bot.resource.cog.validators.program_code_validator import (
+from bot.resource.cog.validator.discord_id_validator import DiscordIdValidator
+from bot.resource.cog.validator.name_validator import NameValidator
+from bot.resource.cog.validator.ni_validator import NIValidator
+from bot.resource.cog.validator.program_code_validator import (
     ProgramCodeValidator,
 )
 from bot.domain.student.attribut.firstname import Firstname
diff --git a/bot/resource/cog/registration/factory/force_register_student_request_factory.py b/bot/resource/cog/registration/factory/force_register_student_request_factory.py
index ae19112..16da0e5 100644
--- a/bot/resource/cog/registration/factory/force_register_student_request_factory.py
+++ b/bot/resource/cog/registration/factory/force_register_student_request_factory.py
@@ -1,13 +1,13 @@
 from typing import Tuple
 
-from bot.application.student.exceptions.invalid_discord_id_format_exception import (
+from bot.application.student.exception.invalid_discord_id_format_exception import (
     InvalidDiscordIdFormatException,
 )
-from bot.application.student.exceptions.invalid_ni_format_exception import (
+from bot.application.student.exception.invalid_ni_format_exception import (
     InvalidNIFormatException,
 )
-from bot.resource.cog.validators.discord_id_validator import DiscordIdValidator
-from bot.resource.cog.validators.ni_validator import NIValidator
+from bot.resource.cog.validator.discord_id_validator import DiscordIdValidator
+from bot.resource.cog.validator.ni_validator import NIValidator
 from bot.domain.student.attribut.discord_user_id import DiscordUserId
 from bot.domain.student.factory.ni_factory import NIFactory
 from bot.resource.cog.registration.factory.request_factory import RequestFactory
diff --git a/bot/resource/cog/registration/factory/force_unregister_student_request_factory.py b/bot/resource/cog/registration/factory/force_unregister_student_request_factory.py
index 660aff1..a9ad4b0 100644
--- a/bot/resource/cog/registration/factory/force_unregister_student_request_factory.py
+++ b/bot/resource/cog/registration/factory/force_unregister_student_request_factory.py
@@ -1,9 +1,9 @@
 from typing import Tuple
 
-from bot.application.student.exceptions.invalid_ni_format_exception import (
+from bot.application.student.exception.invalid_ni_format_exception import (
     InvalidNIFormatException,
 )
-from bot.resource.cog.validators.ni_validator import NIValidator
+from bot.resource.cog.validator.ni_validator import NIValidator
 from bot.domain.student.factory.ni_factory import NIFactory
 from bot.resource.cog.registration.factory.request_factory import RequestFactory
 from bot.resource.cog.registration.request.force_unregister_student_request import (
diff --git a/bot/resource/cog/registration/factory/register_student_request_factory.py b/bot/resource/cog/registration/factory/register_student_request_factory.py
index 3efbb74..ed4d77f 100644
--- a/bot/resource/cog/registration/factory/register_student_request_factory.py
+++ b/bot/resource/cog/registration/factory/register_student_request_factory.py
@@ -1,9 +1,9 @@
 from typing import Tuple
 
-from bot.application.student.exceptions.invalid_ni_format_exception import (
+from bot.application.student.exception.invalid_ni_format_exception import (
     InvalidNIFormatException,
 )
-from bot.resource.cog.validators.ni_validator import NIValidator
+from bot.resource.cog.validator.ni_validator import NIValidator
 from bot.domain.student.attribut.discord_user_id import DiscordUserId
 from bot.domain.student.factory.ni_factory import NIFactory
 from bot.resource.cog.registration.factory.request_factory import RequestFactory
diff --git a/bot/resource/cog/registration/factory/unregister_student_request_factory.py b/bot/resource/cog/registration/factory/unregister_student_request_factory.py
index cd74b91..62c97f8 100644
--- a/bot/resource/cog/registration/factory/unregister_student_request_factory.py
+++ b/bot/resource/cog/registration/factory/unregister_student_request_factory.py
@@ -1,9 +1,9 @@
 from typing import Tuple
 
-from bot.application.student.exceptions.invalid_discord_id_format_exception import (
+from bot.application.student.exception.invalid_discord_id_format_exception import (
     InvalidDiscordIdFormatException,
 )
-from bot.resource.cog.validators.discord_id_validator import DiscordIdValidator
+from bot.resource.cog.validator.discord_id_validator import DiscordIdValidator
 from bot.domain.student.attribut.discord_user_id import DiscordUserId
 from bot.resource.cog.registration.factory.request_factory import RequestFactory
 from bot.resource.cog.registration.request.unregister_student_request import (
diff --git a/bot/resource/cog/validators/__init__.py b/bot/resource/cog/validator/__init__.py
similarity index 100%
rename from bot/resource/cog/validators/__init__.py
rename to bot/resource/cog/validator/__init__.py
diff --git a/bot/resource/cog/validators/discord_id_validator.py b/bot/resource/cog/validator/discord_id_validator.py
similarity index 100%
rename from bot/resource/cog/validators/discord_id_validator.py
rename to bot/resource/cog/validator/discord_id_validator.py
diff --git a/bot/resource/cog/validators/name_validator.py b/bot/resource/cog/validator/name_validator.py
similarity index 100%
rename from bot/resource/cog/validators/name_validator.py
rename to bot/resource/cog/validator/name_validator.py
diff --git a/bot/resource/cog/validators/ni_validator.py b/bot/resource/cog/validator/ni_validator.py
similarity index 100%
rename from bot/resource/cog/validators/ni_validator.py
rename to bot/resource/cog/validator/ni_validator.py
diff --git a/bot/resource/cog/validators/program_code_validator.py b/bot/resource/cog/validator/program_code_validator.py
similarity index 100%
rename from bot/resource/cog/validators/program_code_validator.py
rename to bot/resource/cog/validator/program_code_validator.py
diff --git a/tests/application/test_student_service.py b/tests/application/test_student_service.py
index 6837b2f..9441477 100644
--- a/tests/application/test_student_service.py
+++ b/tests/application/test_student_service.py
@@ -2,10 +2,10 @@
 
 from unittest.mock import MagicMock, AsyncMock
 
-from bot.application.student.exceptions.student_already_exist import (
+from bot.application.student.exception.student_already_exist import (
     StudentAlreadyExistsException,
 )
-from bot.application.student.exceptions.student_already_registered_exception import (
+from bot.application.student.exception.student_already_registered_exception import (
     StudentAlreadyRegisteredException,
 )
 from bot.application.student.student_service import StudentService
diff --git a/tests/application/validators/test_discord_id_validator.py b/tests/application/validator/test_discord_id_validator.py
similarity index 89%
rename from tests/application/validators/test_discord_id_validator.py
rename to tests/application/validator/test_discord_id_validator.py
index 944d522..38d40db 100644
--- a/tests/application/validators/test_discord_id_validator.py
+++ b/tests/application/validator/test_discord_id_validator.py
@@ -1,6 +1,6 @@
 import pytest
 
-from bot.resource.cog.validators.discord_id_validator import DiscordIdValidator
+from bot.resource.cog.validator.discord_id_validator import DiscordIdValidator
 
 DISCORD_ID: int = 123456789012749572
 OLD_DISCORD_ID: int = 1234567891023567
diff --git a/tests/application/validators/test_name_validator.py b/tests/application/validator/test_name_validator.py
similarity index 95%
rename from tests/application/validators/test_name_validator.py
rename to tests/application/validator/test_name_validator.py
index 5344f29..df42674 100644
--- a/tests/application/validators/test_name_validator.py
+++ b/tests/application/validator/test_name_validator.py
@@ -1,6 +1,6 @@
 import pytest
 
-from bot.resource.cog.validators.name_validator import NameValidator
+from bot.resource.cog.validator.name_validator import NameValidator
 
 NAME: str = "Clemou Delta"
 COMPOSED_NAME: str = "Clemou-Delta"
diff --git a/tests/application/validators/test_ni_validator.py b/tests/application/validator/test_ni_validator.py
similarity index 91%
rename from tests/application/validators/test_ni_validator.py
rename to tests/application/validator/test_ni_validator.py
index a2f1af4..d8526a7 100644
--- a/tests/application/validators/test_ni_validator.py
+++ b/tests/application/validator/test_ni_validator.py
@@ -1,6 +1,6 @@
 import pytest
 
-from bot.resource.cog.validators.ni_validator import NIValidator
+from bot.resource.cog.validator.ni_validator import NIValidator
 
 NI: str = "111222333"
 INVALID_DIGIT_LEN_NI: str = "11122233"