diff --git a/editor/register_editor_types.cpp b/editor/register_editor_types.cpp
index 7204e711b7..f3e1aa8698 100644
--- a/editor/register_editor_types.cpp
+++ b/editor/register_editor_types.cpp
@@ -86,7 +86,9 @@
 #include "editor/scene/2d/skeleton_2d_editor_plugin.h"
 #include "editor/scene/2d/sprite_2d_editor_plugin.h"
 #include "editor/scene/2d/tiles/tiles_editor_plugin.h"
+#include "editor/scene/3d/bone_map_editor_plugin.h"
 #include "editor/scene/3d/camera_3d_editor_plugin.h"
+#include "editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.h"
 #include "editor/scene/3d/lightmap_gi_editor_plugin.h"
 #include "editor/scene/3d/mesh_editor_plugin.h"
 #include "editor/scene/3d/mesh_instance_3d_editor_plugin.h"
@@ -100,9 +102,7 @@
 #include "editor/scene/3d/polygon_3d_editor_plugin.h"
 #include "editor/scene/3d/skeleton_3d_editor_plugin.h"
 #include "editor/scene/3d/voxel_gi_editor_plugin.h"
-#include "editor/scene/bone_map_editor_plugin.h"
 #include "editor/scene/curve_editor_plugin.h"
-#include "editor/scene/gpu_particles_collision_sdf_editor_plugin.h"
 #include "editor/scene/gradient_editor_plugin.h"
 #include "editor/scene/gui/control_editor_plugin.h"
 #include "editor/scene/gui/font_config_plugin.h"
diff --git a/editor/scene/bone_map_editor_plugin.cpp b/editor/scene/3d/bone_map_editor_plugin.cpp
similarity index 100%
rename from editor/scene/bone_map_editor_plugin.cpp
rename to editor/scene/3d/bone_map_editor_plugin.cpp
diff --git a/editor/scene/bone_map_editor_plugin.h b/editor/scene/3d/bone_map_editor_plugin.h
similarity index 100%
rename from editor/scene/bone_map_editor_plugin.h
rename to editor/scene/3d/bone_map_editor_plugin.h
diff --git a/editor/scene/3d/gizmos/SCsub b/editor/scene/3d/gizmos/SCsub
index b3cff5b9dc..382b52520f 100644
--- a/editor/scene/3d/gizmos/SCsub
+++ b/editor/scene/3d/gizmos/SCsub
@@ -4,3 +4,5 @@ from misc.utility.scons_hints import *
 Import("env")
 
 env.add_source_files(env.editor_sources, "*.cpp")
+
+SConscript("physics/SCsub")
diff --git a/editor/scene/3d/gizmos/physics/SCsub b/editor/scene/3d/gizmos/physics/SCsub
new file mode 100644
index 0000000000..b3cff5b9dc
--- /dev/null
+++ b/editor/scene/3d/gizmos/physics/SCsub
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+from misc.utility.scons_hints import *
+
+Import("env")
+
+env.add_source_files(env.editor_sources, "*.cpp")
diff --git a/editor/scene/3d/gizmos/collision_object_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/physics/collision_object_3d_gizmo_plugin.cpp
similarity index 100%
rename from editor/scene/3d/gizmos/collision_object_3d_gizmo_plugin.cpp
rename to editor/scene/3d/gizmos/physics/collision_object_3d_gizmo_plugin.cpp
diff --git a/editor/scene/3d/gizmos/collision_object_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/physics/collision_object_3d_gizmo_plugin.h
similarity index 100%
rename from editor/scene/3d/gizmos/collision_object_3d_gizmo_plugin.h
rename to editor/scene/3d/gizmos/physics/collision_object_3d_gizmo_plugin.h
diff --git a/editor/scene/3d/gizmos/collision_polygon_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/physics/collision_polygon_3d_gizmo_plugin.cpp
similarity index 100%
rename from editor/scene/3d/gizmos/collision_polygon_3d_gizmo_plugin.cpp
rename to editor/scene/3d/gizmos/physics/collision_polygon_3d_gizmo_plugin.cpp
diff --git a/editor/scene/3d/gizmos/collision_polygon_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/physics/collision_polygon_3d_gizmo_plugin.h
similarity index 100%
rename from editor/scene/3d/gizmos/collision_polygon_3d_gizmo_plugin.h
rename to editor/scene/3d/gizmos/physics/collision_polygon_3d_gizmo_plugin.h
diff --git a/editor/scene/3d/gizmos/collision_shape_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/physics/collision_shape_3d_gizmo_plugin.cpp
similarity index 100%
rename from editor/scene/3d/gizmos/collision_shape_3d_gizmo_plugin.cpp
rename to editor/scene/3d/gizmos/physics/collision_shape_3d_gizmo_plugin.cpp
diff --git a/editor/scene/3d/gizmos/collision_shape_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/physics/collision_shape_3d_gizmo_plugin.h
similarity index 100%
rename from editor/scene/3d/gizmos/collision_shape_3d_gizmo_plugin.h
rename to editor/scene/3d/gizmos/physics/collision_shape_3d_gizmo_plugin.h
diff --git a/editor/scene/3d/gizmos/joint_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.cpp
similarity index 100%
rename from editor/scene/3d/gizmos/joint_3d_gizmo_plugin.cpp
rename to editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.cpp
diff --git a/editor/scene/3d/gizmos/joint_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.h
similarity index 100%
rename from editor/scene/3d/gizmos/joint_3d_gizmo_plugin.h
rename to editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.h
diff --git a/editor/scene/3d/gizmos/physics_bone_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/physics/physics_bone_3d_gizmo_plugin.cpp
similarity index 99%
rename from editor/scene/3d/gizmos/physics_bone_3d_gizmo_plugin.cpp
rename to editor/scene/3d/gizmos/physics/physics_bone_3d_gizmo_plugin.cpp
index b3a65e9a24..84ec0946d2 100644
--- a/editor/scene/3d/gizmos/physics_bone_3d_gizmo_plugin.cpp
+++ b/editor/scene/3d/gizmos/physics/physics_bone_3d_gizmo_plugin.cpp
@@ -30,7 +30,7 @@
 
 #include "physics_bone_3d_gizmo_plugin.h"
 
-#include "editor/scene/3d/gizmos/joint_3d_gizmo_plugin.h"
+#include "editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "scene/3d/physics/physical_bone_3d.h"
 #include "scene/3d/physics/physical_bone_simulator_3d.h"
diff --git a/editor/scene/3d/gizmos/physics_bone_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/physics/physics_bone_3d_gizmo_plugin.h
similarity index 100%
rename from editor/scene/3d/gizmos/physics_bone_3d_gizmo_plugin.h
rename to editor/scene/3d/gizmos/physics/physics_bone_3d_gizmo_plugin.h
diff --git a/editor/scene/3d/gizmos/ray_cast_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/physics/ray_cast_3d_gizmo_plugin.cpp
similarity index 100%
rename from editor/scene/3d/gizmos/ray_cast_3d_gizmo_plugin.cpp
rename to editor/scene/3d/gizmos/physics/ray_cast_3d_gizmo_plugin.cpp
diff --git a/editor/scene/3d/gizmos/ray_cast_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/physics/ray_cast_3d_gizmo_plugin.h
similarity index 100%
rename from editor/scene/3d/gizmos/ray_cast_3d_gizmo_plugin.h
rename to editor/scene/3d/gizmos/physics/ray_cast_3d_gizmo_plugin.h
diff --git a/editor/scene/3d/gizmos/shape_cast_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/physics/shape_cast_3d_gizmo_plugin.cpp
similarity index 100%
rename from editor/scene/3d/gizmos/shape_cast_3d_gizmo_plugin.cpp
rename to editor/scene/3d/gizmos/physics/shape_cast_3d_gizmo_plugin.cpp
diff --git a/editor/scene/3d/gizmos/shape_cast_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/physics/shape_cast_3d_gizmo_plugin.h
similarity index 100%
rename from editor/scene/3d/gizmos/shape_cast_3d_gizmo_plugin.h
rename to editor/scene/3d/gizmos/physics/shape_cast_3d_gizmo_plugin.h
diff --git a/editor/scene/3d/gizmos/soft_body_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/physics/soft_body_3d_gizmo_plugin.cpp
similarity index 100%
rename from editor/scene/3d/gizmos/soft_body_3d_gizmo_plugin.cpp
rename to editor/scene/3d/gizmos/physics/soft_body_3d_gizmo_plugin.cpp
diff --git a/editor/scene/3d/gizmos/soft_body_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/physics/soft_body_3d_gizmo_plugin.h
similarity index 100%
rename from editor/scene/3d/gizmos/soft_body_3d_gizmo_plugin.h
rename to editor/scene/3d/gizmos/physics/soft_body_3d_gizmo_plugin.h
diff --git a/editor/scene/3d/gizmos/spring_arm_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/physics/spring_arm_3d_gizmo_plugin.cpp
similarity index 100%
rename from editor/scene/3d/gizmos/spring_arm_3d_gizmo_plugin.cpp
rename to editor/scene/3d/gizmos/physics/spring_arm_3d_gizmo_plugin.cpp
diff --git a/editor/scene/3d/gizmos/spring_arm_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/physics/spring_arm_3d_gizmo_plugin.h
similarity index 100%
rename from editor/scene/3d/gizmos/spring_arm_3d_gizmo_plugin.h
rename to editor/scene/3d/gizmos/physics/spring_arm_3d_gizmo_plugin.h
diff --git a/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/physics/spring_bone_3d_gizmo_plugin.cpp
similarity index 100%
rename from editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.cpp
rename to editor/scene/3d/gizmos/physics/spring_bone_3d_gizmo_plugin.cpp
diff --git a/editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/physics/spring_bone_3d_gizmo_plugin.h
similarity index 100%
rename from editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h
rename to editor/scene/3d/gizmos/physics/spring_bone_3d_gizmo_plugin.h
diff --git a/editor/scene/3d/gizmos/vehicle_body_3d_gizmo_plugin.cpp b/editor/scene/3d/gizmos/physics/vehicle_body_3d_gizmo_plugin.cpp
similarity index 100%
rename from editor/scene/3d/gizmos/vehicle_body_3d_gizmo_plugin.cpp
rename to editor/scene/3d/gizmos/physics/vehicle_body_3d_gizmo_plugin.cpp
diff --git a/editor/scene/3d/gizmos/vehicle_body_3d_gizmo_plugin.h b/editor/scene/3d/gizmos/physics/vehicle_body_3d_gizmo_plugin.h
similarity index 100%
rename from editor/scene/3d/gizmos/vehicle_body_3d_gizmo_plugin.h
rename to editor/scene/3d/gizmos/physics/vehicle_body_3d_gizmo_plugin.h
diff --git a/editor/scene/gpu_particles_collision_sdf_editor_plugin.cpp b/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.cpp
similarity index 100%
rename from editor/scene/gpu_particles_collision_sdf_editor_plugin.cpp
rename to editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.cpp
diff --git a/editor/scene/gpu_particles_collision_sdf_editor_plugin.h b/editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.h
similarity index 100%
rename from editor/scene/gpu_particles_collision_sdf_editor_plugin.h
rename to editor/scene/3d/gpu_particles_collision_sdf_editor_plugin.h
diff --git a/editor/scene/3d/node_3d_editor_plugin.cpp b/editor/scene/3d/node_3d_editor_plugin.cpp
index 55505477cd..7e6995d4fd 100644
--- a/editor/scene/3d/node_3d_editor_plugin.cpp
+++ b/editor/scene/3d/node_3d_editor_plugin.cpp
@@ -48,16 +48,12 @@
 #include "editor/scene/3d/gizmos/audio_listener_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/audio_stream_player_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/camera_3d_gizmo_plugin.h"
-#include "editor/scene/3d/gizmos/collision_object_3d_gizmo_plugin.h"
-#include "editor/scene/3d/gizmos/collision_polygon_3d_gizmo_plugin.h"
-#include "editor/scene/3d/gizmos/collision_shape_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/cpu_particles_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/decal_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/fog_volume_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/geometry_instance_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/gpu_particles_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/gpu_particles_collision_3d_gizmo_plugin.h"
-#include "editor/scene/3d/gizmos/joint_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/label_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/light_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/lightmap_gi_gizmo_plugin.h"
@@ -66,15 +62,19 @@
 #include "editor/scene/3d/gizmos/mesh_instance_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/occluder_instance_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/particles_3d_emission_shape_gizmo_plugin.h"
-#include "editor/scene/3d/gizmos/physics_bone_3d_gizmo_plugin.h"
-#include "editor/scene/3d/gizmos/ray_cast_3d_gizmo_plugin.h"
+#include "editor/scene/3d/gizmos/physics/collision_object_3d_gizmo_plugin.h"
+#include "editor/scene/3d/gizmos/physics/collision_polygon_3d_gizmo_plugin.h"
+#include "editor/scene/3d/gizmos/physics/collision_shape_3d_gizmo_plugin.h"
+#include "editor/scene/3d/gizmos/physics/joint_3d_gizmo_plugin.h"
+#include "editor/scene/3d/gizmos/physics/physics_bone_3d_gizmo_plugin.h"
+#include "editor/scene/3d/gizmos/physics/ray_cast_3d_gizmo_plugin.h"
+#include "editor/scene/3d/gizmos/physics/shape_cast_3d_gizmo_plugin.h"
+#include "editor/scene/3d/gizmos/physics/soft_body_3d_gizmo_plugin.h"
+#include "editor/scene/3d/gizmos/physics/spring_arm_3d_gizmo_plugin.h"
+#include "editor/scene/3d/gizmos/physics/spring_bone_3d_gizmo_plugin.h"
+#include "editor/scene/3d/gizmos/physics/vehicle_body_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/reflection_probe_gizmo_plugin.h"
-#include "editor/scene/3d/gizmos/shape_cast_3d_gizmo_plugin.h"
-#include "editor/scene/3d/gizmos/soft_body_3d_gizmo_plugin.h"
-#include "editor/scene/3d/gizmos/spring_arm_3d_gizmo_plugin.h"
-#include "editor/scene/3d/gizmos/spring_bone_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/sprite_base_3d_gizmo_plugin.h"
-#include "editor/scene/3d/gizmos/vehicle_body_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/visible_on_screen_notifier_3d_gizmo_plugin.h"
 #include "editor/scene/3d/gizmos/voxel_gi_gizmo_plugin.h"
 #include "editor/scene/3d/node_3d_editor_gizmos.h"