diff --git a/src/bundle/Resources/api_platform/base_schemas.yml b/src/bundle/Resources/api_platform/schemas/base_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/base_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/base_schemas.yml
diff --git a/src/bundle/Resources/api_platform/bookmarks_schemas.yml b/src/bundle/Resources/api_platform/schemas/bookmarks_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/bookmarks_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/bookmarks_schemas.yml
diff --git a/src/bundle/Resources/api_platform/content_locations_schemas.yml b/src/bundle/Resources/api_platform/schemas/content_locations_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/content_locations_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/content_locations_schemas.yml
diff --git a/src/bundle/Resources/api_platform/content_objects_schemas.yml b/src/bundle/Resources/api_platform/schemas/content_objects_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/content_objects_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/content_objects_schemas.yml
diff --git a/src/bundle/Resources/api_platform/content_sections_schemas.yml b/src/bundle/Resources/api_platform/schemas/content_sections_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/content_sections_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/content_sections_schemas.yml
diff --git a/src/bundle/Resources/api_platform/content_trash_schemas.yml b/src/bundle/Resources/api_platform/schemas/content_trash_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/content_trash_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/content_trash_schemas.yml
diff --git a/src/bundle/Resources/api_platform/content_type_groups_schemas.yml b/src/bundle/Resources/api_platform/schemas/content_type_groups_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/content_type_groups_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/content_type_groups_schemas.yml
diff --git a/src/bundle/Resources/api_platform/content_types_schemas.yml b/src/bundle/Resources/api_platform/schemas/content_types_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/content_types_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/content_types_schemas.yml
diff --git a/src/bundle/Resources/api_platform/content_url_aliases_schemas.yml b/src/bundle/Resources/api_platform/schemas/content_url_aliases_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/content_url_aliases_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/content_url_aliases_schemas.yml
diff --git a/src/bundle/Resources/api_platform/content_url_wildcards_schemas.yml b/src/bundle/Resources/api_platform/schemas/content_url_wildcards_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/content_url_wildcards_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/content_url_wildcards_schemas.yml
diff --git a/src/bundle/Resources/api_platform/language_schemas.yml b/src/bundle/Resources/api_platform/schemas/language_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/language_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/language_schemas.yml
diff --git a/src/bundle/Resources/api_platform/object_state_groups_schemas.yml b/src/bundle/Resources/api_platform/schemas/object_state_groups_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/object_state_groups_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/object_state_groups_schemas.yml
diff --git a/src/bundle/Resources/api_platform/root_schemas.yml b/src/bundle/Resources/api_platform/schemas/root_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/root_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/root_schemas.yml
diff --git a/src/bundle/Resources/api_platform/services_schemas.yml b/src/bundle/Resources/api_platform/schemas/services_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/services_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/services_schemas.yml
diff --git a/src/bundle/Resources/api_platform/user/roles_schemas.yml b/src/bundle/Resources/api_platform/schemas/user/roles_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/user/roles_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/user/roles_schemas.yml
diff --git a/src/bundle/Resources/api_platform/user/sessions_schemas.yml b/src/bundle/Resources/api_platform/schemas/user/sessions_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/user/sessions_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/user/sessions_schemas.yml
diff --git a/src/bundle/Resources/api_platform/user/token_schemas.yml b/src/bundle/Resources/api_platform/schemas/user/token_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/user/token_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/user/token_schemas.yml
diff --git a/src/bundle/Resources/api_platform/user/user_groups_schemas.yml b/src/bundle/Resources/api_platform/schemas/user/user_groups_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/user/user_groups_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/user/user_groups_schemas.yml
diff --git a/src/bundle/Resources/api_platform/user/users_schemas.yml b/src/bundle/Resources/api_platform/schemas/user/users_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/user/users_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/user/users_schemas.yml
diff --git a/src/bundle/Resources/api_platform/views_schemas.yml b/src/bundle/Resources/api_platform/schemas/views_schemas.yml
similarity index 100%
rename from src/bundle/Resources/api_platform/views_schemas.yml
rename to src/bundle/Resources/api_platform/schemas/views_schemas.yml
diff --git a/src/bundle/Resources/config/api_platform.yml b/src/bundle/Resources/config/api_platform.yml
index f0385f1c..422cfe7c 100644
--- a/src/bundle/Resources/config/api_platform.yml
+++ b/src/bundle/Resources/config/api_platform.yml
@@ -41,22 +41,22 @@ services:
         autoconfigure: true
         arguments:
             $files:
-                - '@@IbexaRestBundle/Resources/api_platform/base_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/bookmarks_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/content_locations_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/content_objects_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/content_sections_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/content_trash_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/content_type_groups_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/content_types_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/content_url_aliases_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/content_url_wildcards_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/language_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/object_state_groups_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/services_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/views_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/user/roles_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/user/sessions_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/user/token_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/user/user_groups_schemas.yml'
-                - '@@IbexaRestBundle/Resources/api_platform/user/users_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/base_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/bookmarks_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/content_locations_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/content_objects_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/content_sections_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/content_trash_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/content_type_groups_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/content_types_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/content_url_aliases_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/content_url_wildcards_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/language_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/object_state_groups_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/services_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/views_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/user/roles_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/user/sessions_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/user/token_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/user/user_groups_schemas.yml'
+                - '@@IbexaRestBundle/Resources/api_platform/schemas/user/users_schemas.yml'