diff --git a/apps/users/models.py b/apps/users/models.py
index 288bed1..1d8c90e 100644
--- a/apps/users/models.py
+++ b/apps/users/models.py
@@ -12,7 +12,7 @@ from rest_framework.exceptions import APIException
 import uuid
 
 from apps.users.constans import MAX_OTP_TRY, DEVELOPMENT_PHONE_NUMBERS
-from utils.notifications_client import notification_client
+from utils.notification_client import notification_client
 
 
 class UserManager(BaseUserManager):
diff --git a/gooyal_accounts/settings.py b/gooyal_accounts/settings.py
index c21244b..ea100cf 100644
--- a/gooyal_accounts/settings.py
+++ b/gooyal_accounts/settings.py
@@ -61,7 +61,7 @@ OAUTH2_PROVIDER = {
                'write': 'Write scope',
                'groups': 'Access to your groups',
                'introspection': 'Introspect token scope'},
-    'OAUTH2_VALIDATOR_CLASS': 'utils.MultiGatewayOAuth2Validator'
+    'OAUTH2_VALIDATOR_CLASS': 'utils.oauth2_provider.MultiGatewayOAuth2Validator'
 }
 
 REST_FRAMEWORK = {
diff --git a/utils/notifications_client.py b/utils/notification_client.py
similarity index 100%
rename from utils/notifications_client.py
rename to utils/notification_client.py
diff --git a/utils.py b/utils/oauth2_provider.py
similarity index 100%
rename from utils.py
rename to utils/oauth2_provider.py