diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp
index f416ca81a..8f7997a9d 100644
--- a/editor/import/resource_importer_scene.cpp
+++ b/editor/import/resource_importer_scene.cpp
@@ -41,15 +41,15 @@
 #include "scene/3d/vehicle_body.h"
 #include "scene/animation/animation_player.h"
 #include "scene/animation/animation.h"
-#include "scene/resources/box_shape.h"
+#include "scene/resources/shapes/box_shape.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/navigation_mesh.h"
 #include "scene/resources/packed_scene.h"
-#include "scene/resources/plane_shape.h"
-#include "scene/resources/ray_shape.h"
+#include "scene/resources/shapes/plane_shape.h"
+#include "scene/resources/shapes/ray_shape.h"
 #include "scene/resources/resource_format_text.h"
-#include "scene/resources/shape.h"
-#include "scene/resources/sphere_shape.h"
+#include "scene/resources/shapes/shape.h"
+#include "scene/resources/shapes/sphere_shape.h"
 
 uint32_t EditorSceneImporter::get_import_flags() const {
 	if (get_script_instance()) {
diff --git a/editor/plugins/mesh_instance_editor_plugin.cpp b/editor/plugins/mesh_instance_editor_plugin.cpp
index 4e3c87840..05b77a68c 100644
--- a/editor/plugins/mesh_instance_editor_plugin.cpp
+++ b/editor/plugins/mesh_instance_editor_plugin.cpp
@@ -61,7 +61,7 @@
 #include "scene/main/scene_tree.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/navigation_mesh.h"
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 #include "spatial_editor_plugin.h"
 
 void MeshInstanceEditor::_node_removed(Node *p_node) {
diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp
index c697a7345..a2bfee215 100644
--- a/editor/plugins/spatial_editor_plugin.cpp
+++ b/editor/plugins/spatial_editor_plugin.cpp
@@ -93,7 +93,7 @@
 #include "scene/resources/gradient.h"
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/shader.h"
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 #include "scene/resources/style_box.h"
 #include "scene/resources/surface_tool.h"
 #include "scene/resources/world_3d.h"
diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp
index 1971d6662..fcc3bf473 100644
--- a/editor/spatial_editor_gizmos.cpp
+++ b/editor/spatial_editor_gizmos.cpp
@@ -86,21 +86,21 @@
 #include "scene/main/scene_tree.h"
 #include "scene/main/timer.h"
 #include "scene/main/viewport.h"
-#include "scene/resources/box_shape.h"
-#include "scene/resources/capsule_shape.h"
-#include "scene/resources/concave_polygon_shape.h"
-#include "scene/resources/convex_polygon_shape.h"
-#include "scene/resources/cylinder_shape.h"
-#include "scene/resources/height_map_shape.h"
+#include "scene/resources/shapes/box_shape.h"
+#include "scene/resources/shapes/capsule_shape.h"
+#include "scene/resources/shapes/concave_polygon_shape.h"
+#include "scene/resources/shapes/convex_polygon_shape.h"
+#include "scene/resources/shapes/cylinder_shape.h"
+#include "scene/resources/shapes/height_map_shape.h"
 #include "scene/resources/material.h"
 #include "scene/resources/navigation_mesh.h"
 #include "scene/resources/occluder_shape.h"
 #include "scene/resources/occluder_shape_polygon.h"
-#include "scene/resources/plane_shape.h"
+#include "scene/resources/shapes/plane_shape.h"
 #include "scene/resources/primitive_meshes.h"
-#include "scene/resources/ray_shape.h"
-#include "scene/resources/shape.h"
-#include "scene/resources/sphere_shape.h"
+#include "scene/resources/shapes/ray_shape.h"
+#include "scene/resources/shapes/shape.h"
+#include "scene/resources/shapes/sphere_shape.h"
 #include "scene/resources/surface_tool.h"
 #include "scene/resources/world_3d.h"
 #include "servers/navigation_server.h"
diff --git a/editor_modules/gltf/extensions/physics/gltf_collider.cpp b/editor_modules/gltf/extensions/physics/gltf_collider.cpp
index fab20aeb4..04068358a 100644
--- a/editor_modules/gltf/extensions/physics/gltf_collider.cpp
+++ b/editor_modules/gltf/extensions/physics/gltf_collider.cpp
@@ -33,12 +33,12 @@
 #include "../../gltf_state.h"
 #include "core/math/convex_hull.h"
 #include "scene/3d/area.h"
-#include "scene/resources/box_shape.h"
-#include "scene/resources/capsule_shape.h"
-#include "scene/resources/concave_polygon_shape.h"
-#include "scene/resources/convex_polygon_shape.h"
-#include "scene/resources/cylinder_shape.h"
-#include "scene/resources/sphere_shape.h"
+#include "scene/resources/shapes/box_shape.h"
+#include "scene/resources/shapes/capsule_shape.h"
+#include "scene/resources/shapes/concave_polygon_shape.h"
+#include "scene/resources/shapes/convex_polygon_shape.h"
+#include "scene/resources/shapes/cylinder_shape.h"
+#include "scene/resources/shapes/sphere_shape.h"
 
 void GLTFCollider::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("to_node", "cache_shapes"), &GLTFCollider::to_node, DEFVAL(false));
diff --git a/modules/csg/csg_shape.h b/modules/csg/csg_shape.h
index 472375286..de0edb2bb 100644
--- a/modules/csg/csg_shape.h
+++ b/modules/csg/csg_shape.h
@@ -36,7 +36,7 @@
 #include "csg.h"
 #include "scene/3d/path.h"
 #include "scene/3d/visual_instance.h"
-#include "scene/resources/concave_polygon_shape.h"
+#include "scene/resources/shapes/concave_polygon_shape.h"
 #include "thirdparty/misc/mikktspace.h"
 
 class CSGShape : public GeometryInstance {
diff --git a/modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp b/modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp
index 4f803bb1c..890a42564 100644
--- a/modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp
+++ b/modules/gridmap/geometry_parser/gridmap_navigation_geometry_parser_3d.cpp
@@ -35,18 +35,18 @@
 #include "core/math/convex_hull.h"
 #include "scene/3d/mesh_instance.h"
 #include "scene/3d/physics_body.h"
-#include "scene/resources/box_shape.h"
-#include "scene/resources/capsule_shape.h"
-#include "scene/resources/concave_polygon_shape.h"
-#include "scene/resources/convex_polygon_shape.h"
-#include "scene/resources/cylinder_shape.h"
-#include "scene/resources/height_map_shape.h"
+#include "scene/resources/shapes/box_shape.h"
+#include "scene/resources/shapes/capsule_shape.h"
+#include "scene/resources/shapes/concave_polygon_shape.h"
+#include "scene/resources/shapes/convex_polygon_shape.h"
+#include "scene/resources/shapes/cylinder_shape.h"
+#include "scene/resources/shapes/height_map_shape.h"
 #include "scene/resources/navigation_mesh.h"
 #include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
-#include "scene/resources/plane_shape.h"
+#include "scene/resources/shapes/plane_shape.h"
 #include "scene/resources/primitive_meshes.h"
-#include "scene/resources/shape.h"
-#include "scene/resources/sphere_shape.h"
+#include "scene/resources/shapes/shape.h"
+#include "scene/resources/shapes/sphere_shape.h"
 
 bool GridMap3DNavigationGeometryParser3D::parses_node(Node *p_node) {
 	return (Object::cast_to<GridMap>(p_node) != nullptr);
diff --git a/modules/gridmap/mesh_library.cpp b/modules/gridmap/mesh_library.cpp
index 6a4d26ba9..bbe245080 100644
--- a/modules/gridmap/mesh_library.cpp
+++ b/modules/gridmap/mesh_library.cpp
@@ -30,7 +30,7 @@
 
 #include "mesh_library.h"
 
-#include "scene/resources/box_shape.h"
+#include "scene/resources/shapes/box_shape.h"
 #include "scene/resources/navigation_mesh.h"
 
 MeshLibrary::Item::Item() {
diff --git a/modules/gridmap/mesh_library.h b/modules/gridmap/mesh_library.h
index 1e29a7218..22ece12cf 100644
--- a/modules/gridmap/mesh_library.h
+++ b/modules/gridmap/mesh_library.h
@@ -35,7 +35,7 @@
 #include "core/object/resource.h"
 #include "scene/3d/navigation_mesh_instance.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 
 class NavigationMesh;
 
diff --git a/modules/mesh_data_resource/mesh_data_resource.h b/modules/mesh_data_resource/mesh_data_resource.h
index 23add948b..55f851b1e 100644
--- a/modules/mesh_data_resource/mesh_data_resource.h
+++ b/modules/mesh_data_resource/mesh_data_resource.h
@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "scene/resources/mesh.h"
 
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 
 class MeshDataResource : public Resource {
 	GDCLASS(MeshDataResource, Resource);
diff --git a/modules/mesh_data_resource/plugin/mdr_import_plugin_base.cpp b/modules/mesh_data_resource/plugin/mdr_import_plugin_base.cpp
index eadcd1069..7dcb2307f 100644
--- a/modules/mesh_data_resource/plugin/mdr_import_plugin_base.cpp
+++ b/modules/mesh_data_resource/plugin/mdr_import_plugin_base.cpp
@@ -22,13 +22,13 @@ SOFTWARE.
 
 #include "mdr_import_plugin_base.h"
 
-#include "scene/resources/box_shape.h"
-#include "scene/resources/capsule_shape.h"
-#include "scene/resources/concave_polygon_shape.h"
-#include "scene/resources/convex_polygon_shape.h"
-#include "scene/resources/cylinder_shape.h"
-#include "scene/resources/shape.h"
-#include "scene/resources/sphere_shape.h"
+#include "scene/resources/shapes/box_shape.h"
+#include "scene/resources/shapes/capsule_shape.h"
+#include "scene/resources/shapes/concave_polygon_shape.h"
+#include "scene/resources/shapes/convex_polygon_shape.h"
+#include "scene/resources/shapes/cylinder_shape.h"
+#include "scene/resources/shapes/shape.h"
+#include "scene/resources/shapes/sphere_shape.h"
 
 #include "modules/modules_enabled.gen.h"
 
diff --git a/modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp b/modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp
index feb9ef290..4e52fca3a 100644
--- a/modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp
+++ b/modules/navigation_geometry_parsers/geometry_parser_3d/staticbody3d_navigation_geometry_parser_3d.cpp
@@ -33,16 +33,16 @@
 #include "core/math/convex_hull.h"
 #include "scene/3d/mesh_instance.h"
 #include "scene/3d/physics_body.h"
-#include "scene/resources/box_shape.h"
-#include "scene/resources/capsule_shape.h"
-#include "scene/resources/concave_polygon_shape.h"
-#include "scene/resources/convex_polygon_shape.h"
-#include "scene/resources/cylinder_shape.h"
-#include "scene/resources/height_map_shape.h"
-#include "scene/resources/plane_shape.h"
+#include "scene/resources/shapes/box_shape.h"
+#include "scene/resources/shapes/capsule_shape.h"
+#include "scene/resources/shapes/concave_polygon_shape.h"
+#include "scene/resources/shapes/convex_polygon_shape.h"
+#include "scene/resources/shapes/cylinder_shape.h"
+#include "scene/resources/shapes/height_map_shape.h"
+#include "scene/resources/shapes/plane_shape.h"
 #include "scene/resources/primitive_meshes.h"
-#include "scene/resources/shape.h"
-#include "scene/resources/sphere_shape.h"
+#include "scene/resources/shapes/shape.h"
+#include "scene/resources/shapes/sphere_shape.h"
 
 #include "scene/resources/navigation_mesh.h"
 #include "scene/resources/navigation_mesh_source_geometry_data_3d.h"
diff --git a/modules/props/prop_instance_merger.cpp b/modules/props/prop_instance_merger.cpp
index 37d0f13e3..189dd2c9a 100644
--- a/modules/props/prop_instance_merger.cpp
+++ b/modules/props/prop_instance_merger.cpp
@@ -48,7 +48,7 @@
 
 #include "tiled_wall/tiled_wall_data.h"
 
-#include "scene/resources/box_shape.h"
+#include "scene/resources/shapes/box_shape.h"
 
 const float PropInstanceMerger::LOD_CHECK_INTERVAL = 2;
 
diff --git a/modules/props/prop_instance_prop_job.cpp b/modules/props/prop_instance_prop_job.cpp
index 94c005fa5..da973fafd 100644
--- a/modules/props/prop_instance_prop_job.cpp
+++ b/modules/props/prop_instance_prop_job.cpp
@@ -28,7 +28,7 @@ SOFTWARE.
 #include "prop_instance.h"
 #include "prop_instance_merger.h"
 #include "prop_mesher.h"
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 #include "scene/resources/world_3d.h"
 #include "servers/physics_server.h"
 #include "singleton/prop_cache.h"
diff --git a/modules/props_2d/prop_2d_instance_merger.cpp b/modules/props_2d/prop_2d_instance_merger.cpp
index a5e0ca70f..77961ad29 100644
--- a/modules/props_2d/prop_2d_instance_merger.cpp
+++ b/modules/props_2d/prop_2d_instance_merger.cpp
@@ -45,7 +45,7 @@
 
 #include "tiled_wall/tiled_wall_2d_data.h"
 
-#include "scene/resources/box_shape.h"
+#include "scene/resources/shapes/box_shape.h"
 
 bool Prop2DInstanceMerger::get_building() {
 	return _building;
diff --git a/modules/props_2d/prop_2d_instance_prop_job.cpp b/modules/props_2d/prop_2d_instance_prop_job.cpp
index cc6cbb1f8..e6b9b9c53 100644
--- a/modules/props_2d/prop_2d_instance_prop_job.cpp
+++ b/modules/props_2d/prop_2d_instance_prop_job.cpp
@@ -27,7 +27,7 @@ SOFTWARE.
 #include "prop_2d_instance.h"
 #include "prop_2d_instance_merger.h"
 #include "prop_2d_mesher.h"
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 #include "singleton/prop_2d_cache.h"
 
 #include "modules/modules_enabled.gen.h"
diff --git a/modules/skeleton_3d/editor/skeleton_editor_plugin.cpp b/modules/skeleton_3d/editor/skeleton_editor_plugin.cpp
index 347996f2e..4a92b661e 100644
--- a/modules/skeleton_3d/editor/skeleton_editor_plugin.cpp
+++ b/modules/skeleton_3d/editor/skeleton_editor_plugin.cpp
@@ -55,8 +55,8 @@
 #include "scene/gui/texture_rect.h"
 #include "scene/gui/tree.h"
 #include "scene/main/viewport.h"
-#include "scene/resources/capsule_shape.h"
-#include "scene/resources/sphere_shape.h"
+#include "scene/resources/shapes/capsule_shape.h"
+#include "scene/resources/shapes/sphere_shape.h"
 #include "scene/resources/surface_tool.h"
 
 #include "physical_bone_editor_plugin.h"
diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp
index a99c5416d..dd8927824 100644
--- a/scene/3d/area.cpp
+++ b/scene/3d/area.cpp
@@ -29,7 +29,7 @@
 /*************************************************************************/
 
 #include "area.h"
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 #include "scene/scene_string_names.h"
 #include "servers/audio_server.h"
 #include "servers/physics_server.h"
diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp
index 517027abc..1f643c4a4 100644
--- a/scene/3d/audio_stream_player_3d.cpp
+++ b/scene/3d/audio_stream_player_3d.cpp
@@ -36,7 +36,7 @@
 #include "scene/3d/listener.h"
 #include "scene/3d/spatial_velocity_tracker.h"
 #include "scene/main/viewport.h"
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 #include "scene/resources/world_3d.h"
 #include "servers/audio/audio_stream.h"
 #include "servers/physics_server.h"
diff --git a/scene/3d/collision_object.h b/scene/3d/collision_object.h
index ab811799f..cbf76ff37 100644
--- a/scene/3d/collision_object.h
+++ b/scene/3d/collision_object.h
@@ -32,7 +32,7 @@
 
 #include "core/object/reference.h"
 #include "scene/3d/spatial.h"
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 
 class CollisionObject : public Spatial {
 	GDCLASS(CollisionObject, Spatial);
diff --git a/scene/3d/collision_polygon.cpp b/scene/3d/collision_polygon.cpp
index cc41cbbac..159c2a58d 100644
--- a/scene/3d/collision_polygon.cpp
+++ b/scene/3d/collision_polygon.cpp
@@ -32,9 +32,9 @@
 
 #include "collision_object.h"
 #include "core/math/geometry.h"
-#include "scene/resources/concave_polygon_shape.h"
-#include "scene/resources/convex_polygon_shape.h"
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/concave_polygon_shape.h"
+#include "scene/resources/shapes/convex_polygon_shape.h"
+#include "scene/resources/shapes/shape.h"
 
 void CollisionPolygon::_build_polygon() {
 	if (!parent) {
diff --git a/scene/3d/collision_shape.cpp b/scene/3d/collision_shape.cpp
index 0820fc539..4ccb7b7c2 100644
--- a/scene/3d/collision_shape.cpp
+++ b/scene/3d/collision_shape.cpp
@@ -33,15 +33,15 @@
 #include "core/math/quick_hull.h"
 #include "mesh_instance.h"
 #include "physics_body.h"
-#include "scene/resources/box_shape.h"
-#include "scene/resources/capsule_shape.h"
-#include "scene/resources/concave_polygon_shape.h"
-#include "scene/resources/convex_polygon_shape.h"
+#include "scene/resources/shapes/box_shape.h"
+#include "scene/resources/shapes/capsule_shape.h"
+#include "scene/resources/shapes/concave_polygon_shape.h"
+#include "scene/resources/shapes/convex_polygon_shape.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/plane_shape.h"
-#include "scene/resources/ray_shape.h"
-#include "scene/resources/shape.h"
-#include "scene/resources/sphere_shape.h"
+#include "scene/resources/shapes/plane_shape.h"
+#include "scene/resources/shapes/ray_shape.h"
+#include "scene/resources/shapes/shape.h"
+#include "scene/resources/shapes/sphere_shape.h"
 #include "servers/rendering_server.h"
 
 void CollisionShape::make_convex_from_brothers() {
diff --git a/scene/3d/navigation_obstacle.cpp b/scene/3d/navigation_obstacle.cpp
index 8afecf032..53df6c775 100644
--- a/scene/3d/navigation_obstacle.cpp
+++ b/scene/3d/navigation_obstacle.cpp
@@ -37,7 +37,7 @@
 #include "scene/3d/spatial.h"
 #include "scene/resources/material.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 #include "scene/resources/world_3d.h"
 #include "servers/navigation_server.h"
 #include "servers/rendering_server.h"
diff --git a/scene/3d/physics_joint.cpp b/scene/3d/physics_joint.cpp
index 70320d534..4b3349efc 100644
--- a/scene/3d/physics_joint.cpp
+++ b/scene/3d/physics_joint.cpp
@@ -31,7 +31,7 @@
 #include "physics_joint.h"
 
 #include "scene/3d/physics_body.h"
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 #include "scene/scene_string_names.h"
 
 void Joint::_disconnect_signals() {
diff --git a/scene/3d/shape_cast.cpp b/scene/3d/shape_cast.cpp
index 72617ba8f..5e5a8eb72 100644
--- a/scene/3d/shape_cast.cpp
+++ b/scene/3d/shape_cast.cpp
@@ -33,7 +33,7 @@
 #include "collision_object.h"
 #include "core/config/engine.h"
 #include "mesh_instance.h"
-#include "scene/resources/concave_polygon_shape.h"
+#include "scene/resources/shapes/concave_polygon_shape.h"
 #include "scene/resources/material.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/world_3d.h"
diff --git a/scene/3d/shape_cast.h b/scene/3d/shape_cast.h
index beb5c7fce..6b9d14c2e 100644
--- a/scene/3d/shape_cast.h
+++ b/scene/3d/shape_cast.h
@@ -34,7 +34,7 @@
 #include "core/math/color.h"
 
 #include "scene/3d/spatial.h"
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 #include "servers/physics_server.h"
 
 class SpatialMaterial;
diff --git a/scene/3d/spring_arm.cpp b/scene/3d/spring_arm.cpp
index 7ce2d048b..b04edc350 100644
--- a/scene/3d/spring_arm.cpp
+++ b/scene/3d/spring_arm.cpp
@@ -31,8 +31,8 @@
 #include "spring_arm.h"
 #include "core/config/engine.h"
 #include "scene/3d/collision_object.h"
-#include "scene/resources/shape.h"
-#include "scene/resources/sphere_shape.h"
+#include "scene/resources/shapes/shape.h"
+#include "scene/resources/shapes/sphere_shape.h"
 #include "scene/resources/world_3d.h"
 #include "servers/physics_server.h"
 
diff --git a/scene/3d/vehicle_body.cpp b/scene/3d/vehicle_body.cpp
index c79d59141..11e3215e1 100644
--- a/scene/3d/vehicle_body.cpp
+++ b/scene/3d/vehicle_body.cpp
@@ -30,7 +30,7 @@
 
 #include "vehicle_body.h"
 
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 
 #define ROLLING_INFLUENCE_FIX
 
diff --git a/scene/3d/visibility_notifier.cpp b/scene/3d/visibility_notifier.cpp
index 010092d2b..15b3daad9 100644
--- a/scene/3d/visibility_notifier.cpp
+++ b/scene/3d/visibility_notifier.cpp
@@ -35,7 +35,7 @@
 #include "scene/3d/physics_body.h"
 #include "scene/animation/animation_player.h"
 #include "scene/animation/animation_tree.h"
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 #include "scene/resources/world_3d.h"
 #include "scene/scene_string_names.h"
 
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index d38a798c2..e9756ba04 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -140,19 +140,19 @@
 #include "scene/main/world.h"
 #include "scene/resources/audio_stream_sample.h"
 #include "scene/resources/bit_map.h"
-#include "scene/resources/box_shape.h"
-#include "scene/resources/capsule_shape.h"
+#include "scene/resources/shapes/box_shape.h"
+#include "scene/resources/shapes/capsule_shape.h"
 #include "scene/resources/shapes_2d/capsule_shape_2d.h"
 #include "scene/resources/shapes_2d/circle_shape_2d.h"
-#include "scene/resources/concave_polygon_shape.h"
+#include "scene/resources/shapes/concave_polygon_shape.h"
 #include "scene/resources/shapes_2d/concave_polygon_shape_2d.h"
-#include "scene/resources/convex_polygon_shape.h"
+#include "scene/resources/shapes/convex_polygon_shape.h"
 #include "scene/resources/shapes_2d/convex_polygon_shape_2d.h"
-#include "scene/resources/cylinder_shape.h"
+#include "scene/resources/shapes/cylinder_shape.h"
 #include "scene/resources/default_theme/default_theme.h"
 #include "scene/resources/dynamic_font.h"
 #include "scene/resources/gradient.h"
-#include "scene/resources/height_map_shape.h"
+#include "scene/resources/shapes/height_map_shape.h"
 #include "scene/resources/immediate_mesh.h"
 #include "scene/resources/shapes_2d/line_shape_2d.h"
 #include "scene/resources/material.h"
@@ -166,16 +166,16 @@
 #include "scene/resources/packed_scene.h"
 #include "scene/resources/particles_material.h"
 #include "scene/resources/physics_material.h"
-#include "scene/resources/plane_shape.h"
+#include "scene/resources/shapes/plane_shape.h"
 #include "scene/resources/polygon_path_finder.h"
 #include "scene/resources/primitive_meshes.h"
-#include "scene/resources/ray_shape.h"
+#include "scene/resources/shapes/ray_shape.h"
 #include "scene/resources/shapes_2d/rectangle_shape_2d.h"
 #include "scene/resources/resource_format_text.h"
 #include "scene/resources/shapes_2d/segment_shape_2d.h"
 
 #include "scene/resources/sky.h"
-#include "scene/resources/sphere_shape.h"
+#include "scene/resources/shapes/sphere_shape.h"
 #include "scene/resources/surface_tool.h"
 #include "scene/gui/resources/syntax_highlighter.h"
 #include "scene/resources/text_file.h"
diff --git a/scene/resources/SCsub b/scene/resources/SCsub
index 65f321a91..50745d679 100644
--- a/scene/resources/SCsub
+++ b/scene/resources/SCsub
@@ -18,12 +18,20 @@ env.scene_sources += thirdparty_obj
 scene_obj = []
 env.add_source_files(scene_obj, "*.cpp")
 
+# 2d shapes
 shapes_2d_obj = []
 env.add_source_files(shapes_2d_obj, "shapes_2d/*.cpp")
 
 for o in shapes_2d_obj:
     scene_obj.append(o)
 
+# 3d shapes
+shapes_3d_obj = []
+env.add_source_files(shapes_3d_obj, "shapes/*.cpp")
+
+for o in shapes_3d_obj:
+    scene_obj.append(o)
+
 env.scene_sources += scene_obj
 
 # Needed to force rebuilding the scene files when the thirdparty code is updated.
diff --git a/scene/resources/importer_mesh.h b/scene/resources/importer_mesh.h
index 66ce17121..d6f974318 100644
--- a/scene/resources/importer_mesh.h
+++ b/scene/resources/importer_mesh.h
@@ -33,8 +33,8 @@
 
 #include "core/object/resource.h"
 #include "core/containers/local_vector.h"
-#include "scene/resources/concave_polygon_shape.h"
-#include "scene/resources/convex_polygon_shape.h"
+#include "scene/resources/shapes/concave_polygon_shape.h"
+#include "scene/resources/shapes/convex_polygon_shape.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/navigation_mesh.h"
 
diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp
index 35514227b..314379ea9 100644
--- a/scene/resources/mesh.cpp
+++ b/scene/resources/mesh.cpp
@@ -34,8 +34,8 @@
 #include "core/containers/local_vector.h"
 #include "core/math/convex_hull.h"
 #include "core/containers/pair.h"
-#include "scene/resources/concave_polygon_shape.h"
-#include "scene/resources/convex_polygon_shape.h"
+#include "scene/resources/shapes/concave_polygon_shape.h"
+#include "scene/resources/shapes/convex_polygon_shape.h"
 #include "surface_tool.h"
 
 #include <stdlib.h>
diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h
index 0c4dba730..a980f3473 100644
--- a/scene/resources/mesh.h
+++ b/scene/resources/mesh.h
@@ -35,7 +35,7 @@
 #include "core/object/resource.h"
 
 #include "scene/resources/material.h"
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 #include "servers/rendering_server.h"
 
 class Mesh : public Resource {
diff --git a/scene/resources/box_shape.cpp b/scene/resources/shapes/box_shape.cpp
similarity index 100%
rename from scene/resources/box_shape.cpp
rename to scene/resources/shapes/box_shape.cpp
diff --git a/scene/resources/box_shape.h b/scene/resources/shapes/box_shape.h
similarity index 98%
rename from scene/resources/box_shape.h
rename to scene/resources/shapes/box_shape.h
index f3dc6e51e..7a90f4efd 100644
--- a/scene/resources/box_shape.h
+++ b/scene/resources/shapes/box_shape.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 
 class BoxShape : public Shape {
 	GDCLASS(BoxShape, Shape);
diff --git a/scene/resources/capsule_shape.cpp b/scene/resources/shapes/capsule_shape.cpp
similarity index 100%
rename from scene/resources/capsule_shape.cpp
rename to scene/resources/shapes/capsule_shape.cpp
diff --git a/scene/resources/capsule_shape.h b/scene/resources/shapes/capsule_shape.h
similarity index 98%
rename from scene/resources/capsule_shape.h
rename to scene/resources/shapes/capsule_shape.h
index c2eeeeb14..6d1740388 100644
--- a/scene/resources/capsule_shape.h
+++ b/scene/resources/shapes/capsule_shape.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 
 class CapsuleShape : public Shape {
 	GDCLASS(CapsuleShape, Shape);
diff --git a/scene/resources/concave_polygon_shape.cpp b/scene/resources/shapes/concave_polygon_shape.cpp
similarity index 100%
rename from scene/resources/concave_polygon_shape.cpp
rename to scene/resources/shapes/concave_polygon_shape.cpp
diff --git a/scene/resources/concave_polygon_shape.h b/scene/resources/shapes/concave_polygon_shape.h
similarity index 98%
rename from scene/resources/concave_polygon_shape.h
rename to scene/resources/shapes/concave_polygon_shape.h
index 707a3eac2..191915835 100644
--- a/scene/resources/concave_polygon_shape.h
+++ b/scene/resources/shapes/concave_polygon_shape.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 
 class ConcavePolygonShape : public Shape {
 	GDCLASS(ConcavePolygonShape, Shape);
diff --git a/scene/resources/convex_polygon_shape.cpp b/scene/resources/shapes/convex_polygon_shape.cpp
similarity index 100%
rename from scene/resources/convex_polygon_shape.cpp
rename to scene/resources/shapes/convex_polygon_shape.cpp
diff --git a/scene/resources/convex_polygon_shape.h b/scene/resources/shapes/convex_polygon_shape.h
similarity index 98%
rename from scene/resources/convex_polygon_shape.h
rename to scene/resources/shapes/convex_polygon_shape.h
index 095004686..c994cdaa4 100644
--- a/scene/resources/convex_polygon_shape.h
+++ b/scene/resources/shapes/convex_polygon_shape.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 
 class ConvexPolygonShape : public Shape {
 	GDCLASS(ConvexPolygonShape, Shape);
diff --git a/scene/resources/cylinder_shape.cpp b/scene/resources/shapes/cylinder_shape.cpp
similarity index 100%
rename from scene/resources/cylinder_shape.cpp
rename to scene/resources/shapes/cylinder_shape.cpp
diff --git a/scene/resources/cylinder_shape.h b/scene/resources/shapes/cylinder_shape.h
similarity index 98%
rename from scene/resources/cylinder_shape.h
rename to scene/resources/shapes/cylinder_shape.h
index 8f5f71ff5..2ae73481c 100644
--- a/scene/resources/cylinder_shape.h
+++ b/scene/resources/shapes/cylinder_shape.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 
 class CylinderShape : public Shape {
 	GDCLASS(CylinderShape, Shape);
diff --git a/scene/resources/height_map_shape.cpp b/scene/resources/shapes/height_map_shape.cpp
similarity index 100%
rename from scene/resources/height_map_shape.cpp
rename to scene/resources/shapes/height_map_shape.cpp
diff --git a/scene/resources/height_map_shape.h b/scene/resources/shapes/height_map_shape.h
similarity index 98%
rename from scene/resources/height_map_shape.h
rename to scene/resources/shapes/height_map_shape.h
index a150d2c21..af63b42d7 100644
--- a/scene/resources/height_map_shape.h
+++ b/scene/resources/shapes/height_map_shape.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 
 class HeightMapShape : public Shape {
 	GDCLASS(HeightMapShape, Shape);
diff --git a/scene/resources/plane_shape.cpp b/scene/resources/shapes/plane_shape.cpp
similarity index 100%
rename from scene/resources/plane_shape.cpp
rename to scene/resources/shapes/plane_shape.cpp
diff --git a/scene/resources/plane_shape.h b/scene/resources/shapes/plane_shape.h
similarity index 98%
rename from scene/resources/plane_shape.h
rename to scene/resources/shapes/plane_shape.h
index 0593c3dab..bcf2c9984 100644
--- a/scene/resources/plane_shape.h
+++ b/scene/resources/shapes/plane_shape.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 
 class PlaneShape : public Shape {
 	GDCLASS(PlaneShape, Shape);
diff --git a/scene/resources/ray_shape.cpp b/scene/resources/shapes/ray_shape.cpp
similarity index 100%
rename from scene/resources/ray_shape.cpp
rename to scene/resources/shapes/ray_shape.cpp
diff --git a/scene/resources/ray_shape.h b/scene/resources/shapes/ray_shape.h
similarity index 98%
rename from scene/resources/ray_shape.h
rename to scene/resources/shapes/ray_shape.h
index 935770093..2c154cc97 100644
--- a/scene/resources/ray_shape.h
+++ b/scene/resources/shapes/ray_shape.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 
 class RayShape : public Shape {
 	GDCLASS(RayShape, Shape);
diff --git a/scene/resources/shape.cpp b/scene/resources/shapes/shape.cpp
similarity index 100%
rename from scene/resources/shape.cpp
rename to scene/resources/shapes/shape.cpp
diff --git a/scene/resources/shape.h b/scene/resources/shapes/shape.h
similarity index 100%
rename from scene/resources/shape.h
rename to scene/resources/shapes/shape.h
diff --git a/scene/resources/sphere_shape.cpp b/scene/resources/shapes/sphere_shape.cpp
similarity index 100%
rename from scene/resources/sphere_shape.cpp
rename to scene/resources/shapes/sphere_shape.cpp
diff --git a/scene/resources/sphere_shape.h b/scene/resources/shapes/sphere_shape.h
similarity index 98%
rename from scene/resources/sphere_shape.h
rename to scene/resources/shapes/sphere_shape.h
index 864fa2675..c304f2e2d 100644
--- a/scene/resources/sphere_shape.h
+++ b/scene/resources/shapes/sphere_shape.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/shape.h"
+#include "scene/resources/shapes/shape.h"
 
 class SphereShape : public Shape {
 	GDCLASS(SphereShape, Shape);