diff --git a/server/lib/twenty/server/graphql/init.rb b/server/lib/twenty/server/graphql/init.rb
index 903a878..6f34843 100644
--- a/server/lib/twenty/server/graphql/init.rb
+++ b/server/lib/twenty/server/graphql/init.rb
@@ -2,8 +2,8 @@
 
 module Twenty::GraphQL
   require "graphql"
-  require_relative "input"
-  require_relative "mutation"
-  require_relative "type"
-  require_relative "schema"
+  require_relative "input/init"
+  require_relative "mutation/init"
+  require_relative "type/init"
+  require_relative "schema/init"
 end
diff --git a/server/lib/twenty/server/graphql/input.rb b/server/lib/twenty/server/graphql/input/init.rb
similarity index 70%
rename from server/lib/twenty/server/graphql/input.rb
rename to server/lib/twenty/server/graphql/input/init.rb
index 83033f9..4f02153 100644
--- a/server/lib/twenty/server/graphql/input.rb
+++ b/server/lib/twenty/server/graphql/input/init.rb
@@ -2,5 +2,5 @@
 
 module Twenty::GraphQL::Input
   include GraphQL::Types
-  require_relative "input/task_input"
+  require_relative "task_input"
 end
diff --git a/server/lib/twenty/server/graphql/mutation.rb b/server/lib/twenty/server/graphql/mutation.rb
deleted file mode 100644
index e6aa60c..0000000
--- a/server/lib/twenty/server/graphql/mutation.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Twenty::GraphQL
-  module Mutation
-    require_relative "mutation/destroy_task"
-    require_relative "mutation/complete_task"
-    require_relative "mutation/create_task"
-    require_relative "mutation/update_task"
-    require_relative "mutation/set_random_project_color"
-  end
-end
diff --git a/server/lib/twenty/server/graphql/mutation/init.rb b/server/lib/twenty/server/graphql/mutation/init.rb
new file mode 100644
index 0000000..b499894
--- /dev/null
+++ b/server/lib/twenty/server/graphql/mutation/init.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Twenty::GraphQL
+  module Mutation
+    require_relative "destroy_task"
+    require_relative "complete_task"
+    require_relative "create_task"
+    require_relative "update_task"
+    require_relative "set_random_project_color"
+  end
+end
diff --git a/server/lib/twenty/server/graphql/schema.rb b/server/lib/twenty/server/graphql/schema/init.rb
similarity index 100%
rename from server/lib/twenty/server/graphql/schema.rb
rename to server/lib/twenty/server/graphql/schema/init.rb
diff --git a/server/lib/twenty/server/graphql/type.rb b/server/lib/twenty/server/graphql/type.rb
deleted file mode 100644
index d418bb2..0000000
--- a/server/lib/twenty/server/graphql/type.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module Twenty::GraphQL
-  module Type
-    include ::GraphQL::Types
-  end
-  require_relative "type/task_status"
-  require_relative "type/project"
-  require_relative "type/task"
-  require_relative "type/query"
-  require_relative "type/mutation"
-end
diff --git a/server/lib/twenty/server/graphql/type/init.rb b/server/lib/twenty/server/graphql/type/init.rb
new file mode 100644
index 0000000..8076e02
--- /dev/null
+++ b/server/lib/twenty/server/graphql/type/init.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Twenty::GraphQL
+  module Type
+    include ::GraphQL::Types
+  end
+  require_relative "task_status"
+  require_relative "project"
+  require_relative "task"
+  require_relative "query"
+  require_relative "mutation"
+end