diff --git a/app/config/app.py b/app/config/app.py
index 1442408..a8ebacb 100644
--- a/app/config/app.py
+++ b/app/config/app.py
@@ -3,7 +3,7 @@ from fastapi import FastAPI
 from starlette.graphql import GraphQLApp
 from starlette.middleware.cors import CORSMiddleware
 
-from app.schema.mutations.mutations import Mutations
+from app.schema.mutations.mutation import Mutation
 from app.schema.queries.queries import Query
 
 origins = ["*"]
@@ -21,7 +21,7 @@ def create_app() -> FastAPI:
         allow_headers=headers,
     )
     app.add_route(
-        "/", GraphQLApp(schema=graphene.Schema(query=Query, mutation=Mutations))
+        "/", GraphQLApp(schema=graphene.Schema(query=Query, mutation=Mutation))
     )
 
     return app
diff --git a/app/schema/mutations/__init__.py b/app/schema/mutations/__init__.py
index 7da193a..e69de29 100644
--- a/app/schema/mutations/__init__.py
+++ b/app/schema/mutations/__init__.py
@@ -1,7 +0,0 @@
-from .close_todo import CloseTodo
-from .create_todo import CreateTodo
-from .delete_todo import DeleteTodo
-from .update_todo import UpdateTodo
-from .create_user import CreateUser
-from .update_user import UpdateUser
-from .delete_user import DeleteUser
diff --git a/app/schema/mutations/mutations.py b/app/schema/mutations/mutation.py
similarity index 60%
rename from app/schema/mutations/mutations.py
rename to app/schema/mutations/mutation.py
index 91dd491..a11941e 100644
--- a/app/schema/mutations/mutations.py
+++ b/app/schema/mutations/mutation.py
@@ -1,17 +1,10 @@
 import graphene
 
-from . import (
-    CreateTodo,
-    DeleteTodo,
-    UpdateTodo,
-    CloseTodo,
-    CreateUser,
-    UpdateUser,
-    DeleteUser,
-)
+from app.schema.mutations.todo import CreateTodo, DeleteTodo, CloseTodo, UpdateTodo
+from app.schema.mutations.user import CreateUser, UpdateUser, DeleteUser
 
 
-class Mutations(graphene.ObjectType):
+class Mutation(graphene.ObjectType):
     # todos
     create_todo = CreateTodo.Field()
     update_todo = UpdateTodo.Field()
diff --git a/app/schema/mutations/todo/__init__.py b/app/schema/mutations/todo/__init__.py
new file mode 100644
index 0000000..7cda91d
--- /dev/null
+++ b/app/schema/mutations/todo/__init__.py
@@ -0,0 +1,4 @@
+from .close_todo import CloseTodo
+from .create_todo import CreateTodo
+from .delete_todo import DeleteTodo
+from .update_todo import UpdateTodo
diff --git a/app/schema/mutations/close_todo.py b/app/schema/mutations/todo/close_todo.py
similarity index 100%
rename from app/schema/mutations/close_todo.py
rename to app/schema/mutations/todo/close_todo.py
diff --git a/app/schema/mutations/create_todo.py b/app/schema/mutations/todo/create_todo.py
similarity index 100%
rename from app/schema/mutations/create_todo.py
rename to app/schema/mutations/todo/create_todo.py
diff --git a/app/schema/mutations/delete_todo.py b/app/schema/mutations/todo/delete_todo.py
similarity index 100%
rename from app/schema/mutations/delete_todo.py
rename to app/schema/mutations/todo/delete_todo.py
diff --git a/app/schema/mutations/update_todo.py b/app/schema/mutations/todo/update_todo.py
similarity index 100%
rename from app/schema/mutations/update_todo.py
rename to app/schema/mutations/todo/update_todo.py
diff --git a/app/schema/mutations/user/__init__.py b/app/schema/mutations/user/__init__.py
new file mode 100644
index 0000000..98b8b56
--- /dev/null
+++ b/app/schema/mutations/user/__init__.py
@@ -0,0 +1,3 @@
+from .create_user import CreateUser
+from .delete_user import DeleteUser
+from .update_user import UpdateUser
diff --git a/app/schema/mutations/create_user.py b/app/schema/mutations/user/create_user.py
similarity index 100%
rename from app/schema/mutations/create_user.py
rename to app/schema/mutations/user/create_user.py
diff --git a/app/schema/mutations/delete_user.py b/app/schema/mutations/user/delete_user.py
similarity index 100%
rename from app/schema/mutations/delete_user.py
rename to app/schema/mutations/user/delete_user.py
diff --git a/app/schema/mutations/update_user.py b/app/schema/mutations/user/update_user.py
similarity index 100%
rename from app/schema/mutations/update_user.py
rename to app/schema/mutations/user/update_user.py