diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 9243fd192..642122b6f 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -128,7 +128,6 @@
 #include "editor/plugins/navigation_polygon_editor_plugin.h"
 #include "editor/plugins/path_2d_editor_plugin.h"
 #include "editor/plugins/path_editor_plugin.h"
-#include "editor/plugins/physical_bone_plugin.h"
 #include "editor/plugins/polygon_2d_editor_plugin.h"
 #include "editor/plugins/ray_cast_2d_editor_plugin.h"
 #include "editor/plugins/resource_preloader_editor_plugin.h"
@@ -137,7 +136,6 @@
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor/plugins/script_text_editor.h"
 #include "editor/plugins/shader_editor_plugin.h"
-#include "editor/plugins/skeleton_ik_editor_plugin.h"
 #include "editor/plugins/spatial_editor_plugin.h"
 #include "editor/plugins/sprite_editor_plugin.h"
 #include "editor/plugins/sprite_frames_editor_plugin.h"
@@ -6823,8 +6821,6 @@ EditorNode::EditorNode() {
 	add_editor_plugin(memnew(TextureEditorPlugin(this)));
 	add_editor_plugin(memnew(AudioStreamEditorPlugin(this)));
 	add_editor_plugin(memnew(AudioBusesEditorPlugin(audio_bus_editor)));
-	add_editor_plugin(memnew(SkeletonIKEditorPlugin(this)));
-	add_editor_plugin(memnew(PhysicalBonePlugin(this)));
 	add_editor_plugin(memnew(MeshEditorPlugin(this)));
 	add_editor_plugin(memnew(MaterialEditorPlugin(this)));
 	add_editor_plugin(memnew(ViewportPreviewEditorPlugin(this)));
diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp
index 23fa660b9..3b71b1ca2 100644
--- a/editor/plugins/animation_blend_tree_editor_plugin.cpp
+++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp
@@ -30,25 +30,24 @@
 
 #include "animation_blend_tree_editor_plugin.h"
 
-#include "core/variant/array.h"
-#include "core/object/class_db.h"
-#include "core/math/color.h"
-#include "core/error/error_macros.h"
 #include "core/containers/hash_map.h"
-#include "core/io/resource_loader.h"
 #include "core/containers/list.h"
-#include "core/string/node_path.h"
-#include "core/os/memory.h"
 #include "core/containers/set.h"
-#include "core/typedefs.h"
+#include "core/error/error_macros.h"
+#include "core/io/resource_loader.h"
+#include "core/math/color.h"
+#include "core/object/class_db.h"
 #include "core/object/undo_redo.h"
+#include "core/os/memory.h"
+#include "core/string/node_path.h"
+#include "core/typedefs.h"
+#include "core/variant/array.h"
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_inspector.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
 #include "editor/editor_settings.h"
 #include "scene/2d/canvas_item.h"
-#include "scene/3d/skeleton.h"
 #include "scene/animation/animation_blend_tree.h"
 #include "scene/animation/animation_player.h"
 #include "scene/gui/box_container.h"
@@ -70,6 +69,12 @@
 #include "scene/resources/animation.h"
 #include "scene/resources/style_box.h"
 
+#include "modules/modules_enabled.gen.h"
+
+#ifdef MODULE_SKELETON_3D_ENABLED
+#include "modules/skeleton_3d/nodes/skeleton.h"
+#endif
+
 void AnimationNodeBlendTreeEditor::add_custom_type(const String &p_name, const Ref<Script> &p_script) {
 	for (int i = 0; i < add_options.size(); i++) {
 		ERR_FAIL_COND(add_options[i].script == p_script);
@@ -662,6 +667,7 @@ bool AnimationNodeBlendTreeEditor::_update_filters(const Ref<AnimationNode> &ano
 		}
 
 		if (path.get_subname_count()) {
+#ifdef MODULE_SKELETON_3D_ENABLED
 			String concat = path.get_concatenated_subnames();
 
 			Skeleton *skeleton = Object::cast_to<Skeleton>(node);
@@ -701,7 +707,7 @@ bool AnimationNodeBlendTreeEditor::_update_filters(const Ref<AnimationNode> &ano
 				ti->set_checked(0, anode->is_path_filtered(path));
 				ti->set_icon(0, get_theme_icon("BoneAttachment", "EditorIcons"));
 				ti->set_metadata(0, path);
-
+#endif
 			} else {
 				//just a property
 				ti = filters->create_item(ti);
diff --git a/editor/plugins/root_motion_editor_plugin.cpp b/editor/plugins/root_motion_editor_plugin.cpp
index c5e4b34b5..02c8b9ffc 100644
--- a/editor/plugins/root_motion_editor_plugin.cpp
+++ b/editor/plugins/root_motion_editor_plugin.cpp
@@ -30,18 +30,16 @@
 
 #include "root_motion_editor_plugin.h"
 
-#include "editor/editor_node.h"
-#include "scene/3d/skeleton.h"
-#include "scene/main/viewport.h"
-#include "core/object/class_db.h"
-#include "core/error/error_macros.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
-#include "core/os/memory.h"
-#include "core/object/reference.h"
 #include "core/containers/set.h"
+#include "core/error/error_macros.h"
+#include "core/object/class_db.h"
+#include "core/object/reference.h"
+#include "core/os/memory.h"
 #include "core/string/string_name.h"
 #include "core/typedefs.h"
+#include "editor/editor_node.h"
 #include "scene/animation/animation_player.h"
 #include "scene/animation/animation_tree.h"
 #include "scene/gui/box_container.h"
@@ -51,9 +49,16 @@
 #include "scene/gui/tree.h"
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
+#include "scene/main/viewport.h"
 #include "scene/resources/animation.h"
 #include "scene/resources/texture.h"
 
+#include "modules/modules_enabled.gen.h"
+
+#ifdef MODULE_SKELETON_3D_ENABLED
+#include "modules/skeleton_3d/nodes/skeleton.h"
+#endif
+
 void EditorPropertyRootMotion::_confirmed() {
 	TreeItem *ti = filters->get_selected();
 	if (!ti) {
@@ -145,6 +150,7 @@ void EditorPropertyRootMotion::_node_assign() {
 		}
 
 		if (path.get_subname_count()) {
+#ifdef MODULE_SKELETON_3D_ENABLED
 			String concat = path.get_concatenated_subnames();
 
 			Skeleton *skeleton = Object::cast_to<Skeleton>(node);
@@ -196,6 +202,7 @@ void EditorPropertyRootMotion::_node_assign() {
 					ti->select(0);
 				}
 			}
+#endif
 		} else {
 			if (ti) {
 				//just a node, likely call or animation track
diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp
index 078bab4a4..e0d13e531 100644
--- a/editor/plugins/spatial_editor_plugin.cpp
+++ b/editor/plugins/spatial_editor_plugin.cpp
@@ -6987,7 +6987,6 @@ void SpatialEditor::_register_all_gizmos() {
 	add_gizmo_plugin(Ref<CollisionPolygonSpatialGizmoPlugin>(memnew(CollisionPolygonSpatialGizmoPlugin)));
 	add_gizmo_plugin(Ref<NavigationMeshSpatialGizmoPlugin>(memnew(NavigationMeshSpatialGizmoPlugin)));
 	add_gizmo_plugin(Ref<JointSpatialGizmoPlugin>(memnew(JointSpatialGizmoPlugin)));
-	add_gizmo_plugin(Ref<PhysicalBoneSpatialGizmoPlugin>(memnew(PhysicalBoneSpatialGizmoPlugin)));
 }
 
 void SpatialEditor::_bind_methods() {
diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h
index 3994353a9..610ad36a5 100644
--- a/editor/plugins/spatial_editor_plugin.h
+++ b/editor/plugins/spatial_editor_plugin.h
@@ -36,7 +36,6 @@
 #include "scene/gui/container.h"
 #include "scene/gui/control.h"
 
-#include "scene/3d/skeleton.h"
 #include "scene/gui/spin_box.h"
 
 #include "core/containers/hash_map.h"
diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp
index a08881235..7f975f07e 100644
--- a/editor/spatial_editor_gizmos.cpp
+++ b/editor/spatial_editor_gizmos.cpp
@@ -74,7 +74,6 @@
 #include "scene/3d/reflection_probe.h"
 #include "scene/3d/room.h"
 #include "scene/3d/shape_cast.h"
-#include "scene/3d/skeleton.h"
 #include "scene/3d/soft_body.h"
 #include "scene/3d/spatial.h"
 #include "scene/3d/spring_arm.h"
@@ -100,12 +99,15 @@
 #include "scene/resources/primitive_meshes.h"
 #include "scene/resources/ray_shape.h"
 #include "scene/resources/shape.h"
-#include "scene/resources/skin.h"
 #include "scene/resources/sphere_shape.h"
 #include "scene/resources/surface_tool.h"
 #include "scene/resources/world.h"
 #include "servers/rendering_server.h"
 
+#ifdef MODULE_SKELETON_3D_ENABLED
+#include "modules/skeleton_3d/nodes/skeleton.h"
+#endif
+
 #define HANDLE_HALF_SIZE 9.5
 
 bool EditorSpatialGizmo::is_editable() const {
@@ -278,25 +280,36 @@ void EditorSpatialGizmo::Instance::create_instance(Spatial *p_base, bool p_hidde
 	instance = RS::get_singleton()->instance_create2(mesh->get_rid(), p_base->get_world()->get_scenario());
 	RS::get_singleton()->instance_set_portal_mode(instance, RenderingServer::INSTANCE_PORTAL_MODE_GLOBAL);
 	RS::get_singleton()->instance_attach_object_instance_id(instance, p_base->get_instance_id());
+
+#ifdef MODULE_SKELETON_3D_ENABLED
 	if (skin_reference.is_valid()) {
 		RS::get_singleton()->instance_attach_skeleton(instance, skin_reference->get_skeleton());
 	}
+#endif
+
 	if (extra_margin) {
 		RS::get_singleton()->instance_set_extra_visibility_margin(instance, 1);
 	}
+
 	RS::get_singleton()->instance_geometry_set_cast_shadows_setting(instance, RS::SHADOW_CASTING_SETTING_OFF);
 	int layer = p_hidden ? 0 : 1 << SpatialEditorViewport::GIZMO_EDIT_LAYER;
 	RS::get_singleton()->instance_set_layer_mask(instance, layer); //gizmos are 26
 }
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 void EditorSpatialGizmo::add_mesh(const Ref<Mesh> &p_mesh, const Ref<Material> &p_material, const Transform &p_xform, const Ref<SkinReference> &p_skin_reference) {
+#else
+void EditorSpatialGizmo::add_mesh(const Ref<Mesh> &p_mesh, const Ref<Material> &p_material, const Transform &p_xform) {
+#endif
 	ERR_FAIL_COND(!spatial_node);
 	ERR_FAIL_COND_MSG(!p_mesh.is_valid(), "EditorSpatialGizmo.add_mesh() requires a valid Mesh resource.");
 
 	Instance ins;
 
 	ins.mesh = p_mesh;
+#ifdef MODULE_SKELETON_3D_ENABLED
 	ins.skin_reference = p_skin_reference;
+#endif
 	ins.material = p_material;
 	ins.xform = p_xform;
 
@@ -2181,139 +2194,6 @@ void Position3DSpatialGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) {
 	p_gizmo->add_collision_segments(cursor_points);
 }
 
-////
-
-PhysicalBoneSpatialGizmoPlugin::PhysicalBoneSpatialGizmoPlugin() {
-	create_material("joint_material", EDITOR_DEF("editors/3d_gizmos/gizmo_colors/joint", Color(0.5, 0.8, 1)));
-}
-
-bool PhysicalBoneSpatialGizmoPlugin::has_gizmo(Spatial *p_spatial) {
-	return Object::cast_to<PhysicalBone>(p_spatial) != nullptr;
-}
-
-String PhysicalBoneSpatialGizmoPlugin::get_gizmo_name() const {
-	return "PhysicalBones";
-}
-
-int PhysicalBoneSpatialGizmoPlugin::get_priority() const {
-	return -1;
-}
-
-void PhysicalBoneSpatialGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) {
-	p_gizmo->clear();
-
-	PhysicalBone *physical_bone = Object::cast_to<PhysicalBone>(p_gizmo->get_spatial_node());
-
-	if (!physical_bone) {
-		return;
-	}
-
-	Skeleton *sk(physical_bone->find_skeleton_parent());
-	if (!sk) {
-		return;
-	}
-
-	PhysicalBone *pb(sk->get_physical_bone(physical_bone->get_bone_id()));
-	if (!pb) {
-		return;
-	}
-
-	PhysicalBone *pbp(sk->get_physical_bone_parent(physical_bone->get_bone_id()));
-	if (!pbp) {
-		return;
-	}
-
-	Vector<Vector3> points;
-
-	switch (physical_bone->get_joint_type()) {
-		case PhysicalBone::JOINT_TYPE_PIN: {
-			JointSpatialGizmoPlugin::CreatePinJointGizmo(physical_bone->get_joint_offset(), points);
-		} break;
-		case PhysicalBone::JOINT_TYPE_CONE: {
-			const PhysicalBone::ConeJointData *cjd(static_cast<const PhysicalBone::ConeJointData *>(physical_bone->get_joint_data()));
-			JointSpatialGizmoPlugin::CreateConeTwistJointGizmo(
-					physical_bone->get_joint_offset(),
-					physical_bone->get_global_transform() * physical_bone->get_joint_offset(),
-					pb->get_global_transform(),
-					pbp->get_global_transform(),
-					cjd->swing_span,
-					cjd->twist_span,
-					&points,
-					&points);
-		} break;
-		case PhysicalBone::JOINT_TYPE_HINGE: {
-			const PhysicalBone::HingeJointData *hjd(static_cast<const PhysicalBone::HingeJointData *>(physical_bone->get_joint_data()));
-			JointSpatialGizmoPlugin::CreateHingeJointGizmo(
-					physical_bone->get_joint_offset(),
-					physical_bone->get_global_transform() * physical_bone->get_joint_offset(),
-					pb->get_global_transform(),
-					pbp->get_global_transform(),
-					hjd->angular_limit_lower,
-					hjd->angular_limit_upper,
-					hjd->angular_limit_enabled,
-					points,
-					&points,
-					&points);
-		} break;
-		case PhysicalBone::JOINT_TYPE_SLIDER: {
-			const PhysicalBone::SliderJointData *sjd(static_cast<const PhysicalBone::SliderJointData *>(physical_bone->get_joint_data()));
-			JointSpatialGizmoPlugin::CreateSliderJointGizmo(
-					physical_bone->get_joint_offset(),
-					physical_bone->get_global_transform() * physical_bone->get_joint_offset(),
-					pb->get_global_transform(),
-					pbp->get_global_transform(),
-					sjd->angular_limit_lower,
-					sjd->angular_limit_upper,
-					sjd->linear_limit_lower,
-					sjd->linear_limit_upper,
-					points,
-					&points,
-					&points);
-		} break;
-		case PhysicalBone::JOINT_TYPE_6DOF: {
-			const PhysicalBone::SixDOFJointData *sdofjd(static_cast<const PhysicalBone::SixDOFJointData *>(physical_bone->get_joint_data()));
-			JointSpatialGizmoPlugin::CreateGeneric6DOFJointGizmo(
-					physical_bone->get_joint_offset(),
-
-					physical_bone->get_global_transform() * physical_bone->get_joint_offset(),
-					pb->get_global_transform(),
-					pbp->get_global_transform(),
-
-					sdofjd->axis_data[0].angular_limit_lower,
-					sdofjd->axis_data[0].angular_limit_upper,
-					sdofjd->axis_data[0].linear_limit_lower,
-					sdofjd->axis_data[0].linear_limit_upper,
-					sdofjd->axis_data[0].angular_limit_enabled,
-					sdofjd->axis_data[0].linear_limit_enabled,
-
-					sdofjd->axis_data[1].angular_limit_lower,
-					sdofjd->axis_data[1].angular_limit_upper,
-					sdofjd->axis_data[1].linear_limit_lower,
-					sdofjd->axis_data[1].linear_limit_upper,
-					sdofjd->axis_data[1].angular_limit_enabled,
-					sdofjd->axis_data[1].linear_limit_enabled,
-
-					sdofjd->axis_data[2].angular_limit_lower,
-					sdofjd->axis_data[2].angular_limit_upper,
-					sdofjd->axis_data[2].linear_limit_lower,
-					sdofjd->axis_data[2].linear_limit_upper,
-					sdofjd->axis_data[2].angular_limit_enabled,
-					sdofjd->axis_data[2].linear_limit_enabled,
-
-					points,
-					&points,
-					&points);
-		} break;
-		default:
-			return;
-	}
-
-	Ref<Material> material = get_material("joint_material", p_gizmo);
-
-	p_gizmo->add_collision_segments(points);
-	p_gizmo->add_lines(points, material);
-}
-
 /////
 
 RayCastSpatialGizmoPlugin::RayCastSpatialGizmoPlugin() {
diff --git a/editor/spatial_editor_gizmos.h b/editor/spatial_editor_gizmos.h
index d60fec042..49afb8afc 100644
--- a/editor/spatial_editor_gizmos.h
+++ b/editor/spatial_editor_gizmos.h
@@ -47,11 +47,16 @@
 
 #include "scene/resources/mesh.h"
 
+#include "modules/modules_enabled.gen.h"
+
 class Camera;
 class Spatial;
 class Timer;
 struct Transform;
 class Timer;
+#ifdef MODULE_SKELETON_3D_ENABLED
+class SkinReference;
+#endif
 
 class EditorSpatialGizmo : public SpatialGizmo {
 	GDCLASS(EditorSpatialGizmo, SpatialGizmo);
@@ -61,7 +66,9 @@ public:
 		RID instance;
 		Ref<Mesh> mesh;
 		Ref<Material> material;
+#ifdef MODULE_SKELETON_3D_ENABLED
 		Ref<SkinReference> skin_reference;
+#endif
 		bool extra_margin;
 		Transform xform;
 
@@ -90,7 +97,9 @@ public:
 	Vector<Instance> instances;
 	Spatial *spatial_node;
 
-	void _set_spatial_node(Node *p_node) { set_spatial_node(Object::cast_to<Spatial>(p_node)); }
+	void _set_spatial_node(Node *p_node) {
+		set_spatial_node(Object::cast_to<Spatial>(p_node));
+	}
 
 protected:
 	static void _bind_methods();
@@ -100,7 +109,11 @@ protected:
 public:
 	void add_lines(const Vector<Vector3> &p_lines, const Ref<Material> &p_material, bool p_billboard = false, const Color &p_modulate = Color(1, 1, 1));
 	void add_vertices(const Vector<Vector3> &p_vertices, const Ref<Material> &p_material, Mesh::PrimitiveType p_primitive_type, bool p_billboard = false, const Color &p_modulate = Color(1, 1, 1));
+#ifdef MODULE_SKELETON_3D_ENABLED
 	void add_mesh(const Ref<Mesh> &p_mesh, const Ref<Material> &p_material = Ref<Material>(), const Transform &p_xform = Transform(), const Ref<SkinReference> &p_skin_reference = Ref<SkinReference>());
+#else
+	void add_mesh(const Ref<Mesh> &p_mesh, const Ref<Material> &p_material = Ref<Material>(), const Transform &p_xform = Transform());
+#endif
 	void add_collision_segments(const Vector<Vector3> &p_lines);
 	void add_collision_triangles(const Ref<TriangleMesh> &p_tmesh);
 	void add_unscaled_billboard(const Ref<Material> &p_material, float p_scale = 1, const Color &p_modulate = Color(1, 1, 1));
@@ -119,12 +132,20 @@ public:
 	virtual void set_subgizmo_transform(int p_id, Transform p_transform) const;
 	virtual void commit_subgizmos(const Vector<int> &p_ids, const Vector<Transform> &p_restore, bool p_cancel = false) const;
 
-	void set_selected(bool p_selected) { selected = p_selected; }
-	bool is_selected() const { return selected; }
+	void set_selected(bool p_selected) {
+		selected = p_selected;
+	}
+	bool is_selected() const {
+		return selected;
+	}
 
 	void set_spatial_node(Spatial *p_node);
-	Spatial *get_spatial_node() const { return spatial_node; }
-	Ref<EditorSpatialGizmoPlugin> get_plugin() const { return gizmo_plugin; }
+	Spatial *get_spatial_node() const {
+		return spatial_node;
+	}
+	Ref<EditorSpatialGizmoPlugin> get_plugin() const {
+		return gizmo_plugin;
+	}
 	bool intersect_frustum(const Camera *p_camera, const Vector<Plane> &p_frustum);
 	void handles_intersect_ray(Camera *p_camera, const Vector2 &p_point, bool p_shift_pressed, int &r_id, bool &r_secondary);
 	bool intersect_ray(Camera *p_camera, const Point2 &p_point, Vector3 &r_pos, Vector3 &r_normal);
@@ -316,18 +337,6 @@ public:
 	Position3DSpatialGizmoPlugin();
 };
 
-class PhysicalBoneSpatialGizmoPlugin : public EditorSpatialGizmoPlugin {
-	GDCLASS(PhysicalBoneSpatialGizmoPlugin, EditorSpatialGizmoPlugin);
-
-public:
-	bool has_gizmo(Spatial *p_spatial);
-	String get_gizmo_name() const;
-	int get_priority() const;
-	void redraw(EditorSpatialGizmo *p_gizmo);
-
-	PhysicalBoneSpatialGizmoPlugin();
-};
-
 class RayCastSpatialGizmoPlugin : public EditorSpatialGizmoPlugin {
 	GDCLASS(RayCastSpatialGizmoPlugin, EditorSpatialGizmoPlugin);
 
diff --git a/editor_modules/gltf/editor_scene_importer_gltf.cpp b/editor_modules/gltf/editor_scene_importer_gltf.cpp
index af4bc9261..db2074a88 100644
--- a/editor_modules/gltf/editor_scene_importer_gltf.cpp
+++ b/editor_modules/gltf/editor_scene_importer_gltf.cpp
@@ -32,7 +32,6 @@
 
 #include "editor_scene_importer_gltf.h"
 #include "scene/resources/animation.h"
-#include "scene/resources/skin.h"
 
 #include "gltf_state.h"
 #include "packed_scene_gltf.h"
diff --git a/editor_modules/gltf/gltf_document.cpp b/editor_modules/gltf/gltf_document.cpp
index 09b2e386f..4bb6885dd 100644
--- a/editor_modules/gltf/gltf_document.cpp
+++ b/editor_modules/gltf/gltf_document.cpp
@@ -30,6 +30,14 @@
 
 #include "gltf_document.h"
 
+#include "modules/modules_enabled.gen.h"
+
+#ifdef MODULE_SKELETON_3D_ENABLED
+#include "modules/skeleton_3d/nodes/bone_attachment.h"
+#include "modules/skeleton_3d/nodes/skeleton.h"
+#include "modules/skeleton_3d/resources/skin.h"
+#endif
+
 #include "gltf_accessor.h"
 #include "gltf_animation.h"
 #include "gltf_camera.h"
@@ -51,7 +59,7 @@
 #include "core/version.h"
 #include "drivers/png/png_driver_common.h"
 #include "scene/2d/node_2d.h"
-#include "scene/3d/bone_attachment.h"
+
 #include "scene/3d/mesh_instance.h"
 #include "scene/3d/multimesh_instance.h"
 #include "scene/3d/spatial.h"
@@ -59,7 +67,6 @@
 #include "scene/main/node.h"
 #include "scene/resources/animation.h"
 #include "scene/resources/multimesh.h"
-#include "scene/resources/skin.h"
 #include "scene/resources/surface_tool.h"
 
 #include "modules/modules_enabled.gen.h" // For csg, gridmap, regex.
@@ -4308,6 +4315,7 @@ Error GLTFDocument::_determine_skeleton_roots(Ref<GLTFState> state, const GLTFSk
 	return OK;
 }
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 Error GLTFDocument::_create_skeletons(Ref<GLTFState> state) {
 	for (GLTFSkeletonIndex skel_i = 0; skel_i < state->skeletons.size(); ++skel_i) {
 		Ref<GLTFSkeleton> gltf_skeleton = state->skeletons.write[skel_i];
@@ -4380,6 +4388,7 @@ Error GLTFDocument::_create_skeletons(Ref<GLTFState> state) {
 
 	return OK;
 }
+#endif
 
 Error GLTFDocument::_map_skin_joints_indices_to_skeleton_bone_indices(Ref<GLTFState> state) {
 	for (GLTFSkinIndex skin_i = 0; skin_i < state->skins.size(); ++skin_i) {
@@ -5058,6 +5067,7 @@ void GLTFDocument::_assign_scene_names(Ref<GLTFState> state) {
 	state->scene_name = _gen_unique_name(state, state->scene_name);
 }
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 BoneAttachment *GLTFDocument::_generate_bone_attachment(Ref<GLTFState> state, Skeleton *skeleton, const GLTFNodeIndex node_index, const GLTFNodeIndex bone_index) {
 	Ref<GLTFNode> gltf_node = state->nodes[node_index];
 	Ref<GLTFNode> bone_node = state->nodes[bone_index];
@@ -5071,6 +5081,7 @@ BoneAttachment *GLTFDocument::_generate_bone_attachment(Ref<GLTFState> state, Sk
 
 	return bone_attachment;
 }
+#endif
 
 GLTFMeshIndex GLTFDocument::_convert_mesh_to_gltf(Ref<GLTFState> state, MeshInstance *p_mesh_instance) {
 	ERR_FAIL_NULL_V(p_mesh_instance, -1);
@@ -5309,11 +5320,13 @@ void GLTFDocument::_convert_scene_node(Ref<GLTFState> state, Node *p_current, co
 		BoneAttachment *bone = cast_to<BoneAttachment>(p_current);
 		_convert_bone_attachment_to_gltf(bone, state, p_gltf_parent, p_gltf_root, gltf_node);
 		return;
+#ifdef MODULE_SKELETON_3D_ENABLED
 	} else if (cast_to<Skeleton>(p_current)) {
 		Skeleton *skel = cast_to<Skeleton>(p_current);
 		_convert_skeleton_to_gltf(skel, state, p_gltf_parent, p_gltf_root, gltf_node);
 		// We ignore the Pandemonium Engine node that is the skeleton.
 		return;
+#endif
 	} else if (cast_to<MultiMeshInstance>(p_current)) {
 		MultiMeshInstance *multi = cast_to<MultiMeshInstance>(p_current);
 		_convert_mult_mesh_instance_to_gltf(multi, p_gltf_parent, p_gltf_root, gltf_node, state);
@@ -5433,6 +5446,7 @@ void GLTFDocument::_convert_mult_mesh_instance_to_gltf(MultiMeshInstance *p_mult
 	}
 }
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 void GLTFDocument::_convert_skeleton_to_gltf(Skeleton *p_skeleton3d, Ref<GLTFState> state, GLTFNodeIndex p_parent_node_index, GLTFNodeIndex p_root_node_index, Ref<GLTFNode> gltf_node) {
 	Skeleton *skeleton = p_skeleton3d;
 	Ref<GLTFSkeleton> gltf_skeleton;
@@ -5486,7 +5500,9 @@ void GLTFDocument::_convert_skeleton_to_gltf(Skeleton *p_skeleton3d, Ref<GLTFSta
 		_convert_scene_node(state, skeleton->get_child(node_i), p_parent_node_index, p_root_node_index);
 	}
 }
+#endif
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 void GLTFDocument::_convert_bone_attachment_to_gltf(BoneAttachment *p_bone_attachment, Ref<GLTFState> state, GLTFNodeIndex p_parent_node_index, GLTFNodeIndex p_root_node_index, Ref<GLTFNode> gltf_node) {
 	Skeleton *skeleton;
 	// Note that relative transforms to external skeletons and pose overrides are not supported.
@@ -5517,6 +5533,7 @@ void GLTFDocument::_convert_bone_attachment_to_gltf(BoneAttachment *p_bone_attac
 		_convert_scene_node(state, p_bone_attachment->get_child(node_i), par_node_index, p_root_node_index);
 	}
 }
+#endif
 
 void GLTFDocument::_convert_mesh_instance_to_gltf(MeshInstance *p_scene_parent, Ref<GLTFState> state, Ref<GLTFNode> gltf_node) {
 	GLTFMeshIndex gltf_mesh_index = _convert_mesh_to_gltf(state, p_scene_parent);
@@ -5535,6 +5552,7 @@ void GLTFDocument::_generate_scene_node(Ref<GLTFState> state, Node *scene_parent
 
 	Spatial *current_node = nullptr;
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 	// Is our parent a skeleton
 	Skeleton *active_skeleton = Object::cast_to<Skeleton>(scene_parent);
 
@@ -5555,6 +5573,8 @@ void GLTFDocument::_generate_scene_node(Ref<GLTFState> state, Node *scene_parent
 		// and attach it to the bone_attachment
 		scene_parent = bone_attachment;
 	}
+#endif
+
 	if (gltf_node->mesh >= 0) {
 		current_node = _generate_mesh_instance(state, scene_parent, node_index);
 	} else if (gltf_node->camera >= 0) {
@@ -5582,6 +5602,7 @@ void GLTFDocument::_generate_scene_node(Ref<GLTFState> state, Node *scene_parent
 	}
 }
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 void GLTFDocument::_generate_skeleton_bone_node(Ref<GLTFState> state, Node *scene_parent, Spatial *scene_root, const GLTFNodeIndex node_index) {
 	Ref<GLTFNode> gltf_node = state->nodes[node_index];
 
@@ -5664,6 +5685,7 @@ void GLTFDocument::_generate_skeleton_bone_node(Ref<GLTFState> state, Node *scen
 		_generate_scene_node(state, active_skeleton, scene_root, gltf_node->children[i]);
 	}
 }
+#endif
 
 template <class T>
 struct EditorSceneImporterGLTFInterpolate {
@@ -5823,12 +5845,14 @@ void GLTFDocument::_import_animation(Ref<GLTFState> state, AnimationPlayer *ap,
 		node_path = root->get_path_to(node_element->get());
 
 		if (gltf_node->skeleton >= 0) {
+#ifdef MODULE_SKELETON_3D_ENABLED
 			const Skeleton *sk = state->skeletons[gltf_node->skeleton]->pandemonium_skeleton;
 			ERR_FAIL_COND(sk == nullptr);
 
 			const String path = root->get_path_to(sk);
 			const String bone = gltf_node->get_name();
 			transform_node_path = path + ":" + bone;
+#endif
 		} else {
 			transform_node_path = node_path;
 		}
@@ -6035,6 +6059,7 @@ void GLTFDocument::_convert_mesh_instances(Ref<GLTFState> state) {
 		node->rotation = mi_xform.basis.get_rotation_quaternion();
 		node->translation = mi_xform.origin;
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 		Skeleton *skeleton = Object::cast_to<Skeleton>(mi->get_node(mi->get_skeleton_path()));
 		if (!skeleton) {
 			continue;
@@ -6116,6 +6141,7 @@ void GLTFDocument::_convert_mesh_instances(Ref<GLTFState> state) {
 			node->skeleton = skeleton_gltf_i;
 		}
 	}
+#endif
 }
 
 float GLTFDocument::solve_metallic(float p_dielectric_specular, float diffuse, float specular, float p_one_minus_specular_strength) {
@@ -6150,6 +6176,7 @@ float GLTFDocument::get_max_component(const Color &p_color) {
 }
 
 void GLTFDocument::_process_mesh_instances(Ref<GLTFState> state, Node *scene_root) {
+#ifdef MODULE_SKELETON_3D_ENABLED
 	for (GLTFNodeIndex node_i = 0; node_i < state->nodes.size(); ++node_i) {
 		Ref<GLTFNode> node = state->nodes[node_i];
 
@@ -6176,6 +6203,7 @@ void GLTFDocument::_process_mesh_instances(Ref<GLTFState> state, Node *scene_roo
 			mi->set_transform(Transform());
 		}
 	}
+#endif
 }
 
 GLTFAnimation::Track GLTFDocument::_convert_animation_track(Ref<GLTFState> state, GLTFAnimation::Track p_track, Ref<Animation> p_animation, int32_t p_track_i, GLTFNodeIndex p_node_i) {
@@ -6487,6 +6515,7 @@ void GLTFDocument::_convert_animation(Ref<GLTFState> state, AnimationPlayer *ap,
 				}
 				tracks[mesh_index] = track;
 			}
+#ifdef MODULE_SKELETON_3D_ENABLED
 		} else if (String(orig_track_path).find(":") != -1) {
 			//Process skeleton
 			const Vector<String> node_suffix = String(orig_track_path).split(":");
@@ -6521,6 +6550,7 @@ void GLTFDocument::_convert_animation(Ref<GLTFState> state, AnimationPlayer *ap,
 					gltf_animation->get_tracks()[node_i] = track;
 				}
 			}
+#endif
 		} else if (String(orig_track_path).find(":") == -1) {
 			Node *ap_root = ap->get_node_or_null(ap->get_root());
 			ERR_CONTINUE(!ap_root);
diff --git a/editor_modules/gltf/gltf_document.h b/editor_modules/gltf/gltf_document.h
index d993ee7bb..92451bbfe 100644
--- a/editor_modules/gltf/gltf_document.h
+++ b/editor_modules/gltf/gltf_document.h
@@ -30,11 +30,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/3d/bone_attachment.h"
 #include "scene/3d/camera.h"
 #include "scene/3d/light.h"
 #include "scene/3d/mesh_instance.h"
-#include "scene/3d/skeleton.h"
 #include "scene/3d/spatial.h"
 #include "scene/animation/animation_player.h"
 #include "scene/resources/material.h"
@@ -44,6 +42,9 @@
 
 #include "modules/modules_enabled.gen.h" // For csg, gridmap.
 
+class Skeleton;
+class BoneAttachment;
+
 class GLTFState;
 class GLTFSkin;
 class GLTFNode;
@@ -243,12 +244,13 @@ private:
 	Error _verify_skin(Ref<GLTFState> state, Ref<GLTFSkin> skin);
 	Error _parse_skins(Ref<GLTFState> state);
 	Error _determine_skeletons(Ref<GLTFState> state);
-	Error _reparent_non_joint_skeleton_subtrees(
-			Ref<GLTFState> state, Ref<GLTFSkeleton> skeleton,
-			const Vector<GLTFNodeIndex> &non_joints);
-	Error _determine_skeleton_roots(Ref<GLTFState> state,
-			const GLTFSkeletonIndex skel_i);
+	Error _reparent_non_joint_skeleton_subtrees(Ref<GLTFState> state, Ref<GLTFSkeleton> skeleton, const Vector<GLTFNodeIndex> &non_joints);
+	Error _determine_skeleton_roots(Ref<GLTFState> state, const GLTFSkeletonIndex skel_i);
+
+#ifdef MODULE_SKELETON_3D_ENABLED
 	Error _create_skeletons(Ref<GLTFState> state);
+#endif
+
 	Error _map_skin_joints_indices_to_skeleton_bone_indices(Ref<GLTFState> state);
 	Error _serialize_skins(Ref<GLTFState> state);
 	Error _create_skins(Ref<GLTFState> state);
@@ -259,10 +261,11 @@ private:
 	Error _parse_lights(Ref<GLTFState> state);
 	Error _parse_animations(Ref<GLTFState> state);
 	Error _serialize_animations(Ref<GLTFState> state);
-	BoneAttachment *_generate_bone_attachment(Ref<GLTFState> state,
-			Skeleton *skeleton,
-			const GLTFNodeIndex node_index,
-			const GLTFNodeIndex bone_index);
+
+#ifdef MODULE_SKELETON_3D_ENABLED
+	BoneAttachment *_generate_bone_attachment(Ref<GLTFState> state, Skeleton *skeleton, const GLTFNodeIndex node_index, const GLTFNodeIndex bone_index);
+#endif
+
 	Spatial *_generate_mesh_instance(Ref<GLTFState> state, Node *scene_parent, const GLTFNodeIndex node_index);
 	Camera *_generate_camera(Ref<GLTFState> state, Node *scene_parent,
 			const GLTFNodeIndex node_index);
@@ -367,7 +370,11 @@ public:
 	void _generate_scene_node(Ref<GLTFState> state, Node *scene_parent,
 			Spatial *scene_root,
 			const GLTFNodeIndex node_index);
+
+#ifdef MODULE_SKELETON_3D_ENABLED
 	void _generate_skeleton_bone_node(Ref<GLTFState> state, Node *scene_parent, Spatial *scene_root, const GLTFNodeIndex node_index);
+#endif
+
 	void _import_animation(Ref<GLTFState> state, AnimationPlayer *ap,
 			const GLTFAnimationIndex index, const int bake_fps);
 	void _convert_mesh_instances(Ref<GLTFState> state);
@@ -398,16 +405,19 @@ public:
 			GLTFNodeIndex p_parent_node_index,
 			GLTFNodeIndex p_root_node_index,
 			Ref<GLTFNode> gltf_node, Ref<GLTFState> state);
-	void _convert_skeleton_to_gltf(
-			Skeleton *p_scene_parent, Ref<GLTFState> state,
-			GLTFNodeIndex p_parent_node_index,
-			GLTFNodeIndex p_root_node_index,
-			Ref<GLTFNode> gltf_node);
+
+#ifdef MODULE_SKELETON_3D_ENABLED
+	void _convert_skeleton_to_gltf(Skeleton *p_scene_parent, Ref<GLTFState> state, GLTFNodeIndex p_parent_node_index, GLTFNodeIndex p_root_node_index, Ref<GLTFNode> gltf_node);
+#endif
+
+#ifdef MODULE_SKELETON_3D_ENABLED
 	void _convert_bone_attachment_to_gltf(BoneAttachment *p_bone_attachment,
 			Ref<GLTFState> state,
 			GLTFNodeIndex p_parent_node_index,
 			GLTFNodeIndex p_root_node_index,
 			Ref<GLTFNode> gltf_node);
+#endif
+
 	void _convert_mesh_instance_to_gltf(MeshInstance *p_mesh_instance,
 			Ref<GLTFState> state,
 			Ref<GLTFNode> gltf_node);
diff --git a/editor_modules/gltf/gltf_skeleton.cpp b/editor_modules/gltf/gltf_skeleton.cpp
index 0d0e22ef4..5337affcf 100644
--- a/editor_modules/gltf/gltf_skeleton.cpp
+++ b/editor_modules/gltf/gltf_skeleton.cpp
@@ -35,13 +35,17 @@ void GLTFSkeleton::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_joints", "joints"), &GLTFSkeleton::set_joints);
 	ClassDB::bind_method(D_METHOD("get_roots"), &GLTFSkeleton::get_roots);
 	ClassDB::bind_method(D_METHOD("set_roots", "roots"), &GLTFSkeleton::set_roots);
+	
+#ifdef MODULE_SKELETON_3D_ENABLED
 	ClassDB::bind_method(D_METHOD("get_pandemonium_skeleton"), &GLTFSkeleton::get_pandemonium_skeleton);
+	ClassDB::bind_method(D_METHOD("get_bone_attachment", "idx"), &GLTFSkeleton::get_bone_attachment);
+#endif
+
 	ClassDB::bind_method(D_METHOD("get_unique_names"), &GLTFSkeleton::get_unique_names);
 	ClassDB::bind_method(D_METHOD("set_unique_names", "unique_names"), &GLTFSkeleton::set_unique_names);
 	ClassDB::bind_method(D_METHOD("get_pandemonium_bone_node"), &GLTFSkeleton::get_pandemonium_bone_node);
 	ClassDB::bind_method(D_METHOD("set_pandemonium_bone_node", "pandemonium_bone_node"), &GLTFSkeleton::set_pandemonium_bone_node);
 	ClassDB::bind_method(D_METHOD("get_bone_attachment_count"), &GLTFSkeleton::get_bone_attachment_count);
-	ClassDB::bind_method(D_METHOD("get_bone_attachment", "idx"), &GLTFSkeleton::get_bone_attachment);
 
 	ADD_PROPERTY(PropertyInfo(Variant::POOL_INT_ARRAY, "joints"), "set_joints", "get_joints"); // PoolVector<GLTFNodeIndex>
 	ADD_PROPERTY(PropertyInfo(Variant::POOL_INT_ARRAY, "roots"), "set_roots", "get_roots"); // PoolVector<GLTFNodeIndex>
@@ -65,9 +69,15 @@ void GLTFSkeleton::set_roots(PoolVector<GLTFNodeIndex> p_roots) {
 	roots = p_roots;
 }
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 Skeleton *GLTFSkeleton::get_pandemonium_skeleton() {
 	return pandemonium_skeleton;
 }
+BoneAttachment *GLTFSkeleton::get_bone_attachment(int idx) {
+	ERR_FAIL_INDEX_V(idx, bone_attachments.size(), nullptr);
+	return bone_attachments[idx];
+}
+#endif
 
 Array GLTFSkeleton::get_unique_names() {
 	return GLTFDocument::to_array(unique_names);
@@ -85,11 +95,10 @@ void GLTFSkeleton::set_pandemonium_bone_node(Dictionary p_indict) {
 	GLTFDocument::set_from_dict(pandemonium_bone_node, p_indict);
 }
 
-BoneAttachment *GLTFSkeleton::get_bone_attachment(int idx) {
-	ERR_FAIL_INDEX_V(idx, bone_attachments.size(), nullptr);
-	return bone_attachments[idx];
-}
-
 int32_t GLTFSkeleton::get_bone_attachment_count() {
+#ifdef MODULE_SKELETON_3D_ENABLED
 	return bone_attachments.size();
+#else
+	return 0;
+#endif
 }
diff --git a/editor_modules/gltf/gltf_skeleton.h b/editor_modules/gltf/gltf_skeleton.h
index 309942cc1..3b7aea0be 100644
--- a/editor_modules/gltf/gltf_skeleton.h
+++ b/editor_modules/gltf/gltf_skeleton.h
@@ -34,6 +34,13 @@
 
 #include "gltf_document.h"
 
+#include "modules/modules_enabled.gen.h"
+
+#ifdef MODULE_SKELETON_3D_ENABLED
+#include "modules/skeleton_3d/nodes/bone_attachment.h"
+#include "modules/skeleton_3d/nodes/skeleton.h"
+#endif
+
 class GLTFSkeleton : public Resource {
 	GDCLASS(GLTFSkeleton, Resource);
 	friend class GLTFDocument;
@@ -54,7 +61,9 @@ private:
 
 	Map<int32_t, GLTFNodeIndex> pandemonium_bone_node;
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 	PoolVector<BoneAttachment *> bone_attachments;
+#endif
 
 protected:
 	static void _bind_methods();
@@ -66,7 +75,10 @@ public:
 	PoolVector<GLTFNodeIndex> get_roots();
 	void set_roots(PoolVector<GLTFNodeIndex> p_roots);
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 	Skeleton *get_pandemonium_skeleton();
+	BoneAttachment *get_bone_attachment(int idx);
+#endif
 
 	Array get_unique_names();
 	void set_unique_names(Array p_unique_names);
@@ -74,8 +86,6 @@ public:
 	Dictionary get_pandemonium_bone_node();
 	void set_pandemonium_bone_node(Dictionary p_indict);
 
-	BoneAttachment *get_bone_attachment(int idx);
-
 	int32_t get_bone_attachment_count();
 };
 
diff --git a/editor_modules/gltf/gltf_skin.cpp b/editor_modules/gltf/gltf_skin.cpp
index 5eacb2aa4..933d0a452 100644
--- a/editor_modules/gltf/gltf_skin.cpp
+++ b/editor_modules/gltf/gltf_skin.cpp
@@ -30,7 +30,11 @@
 
 #include "gltf_skin.h"
 
-#include "scene/resources/skin.h"
+#include "modules/modules_enabled.gen.h"
+
+#ifdef MODULE_SKELETON_3D_ENABLED
+#include "modules/skeleton_3d/resources/skin.h"
+#endif
 
 void GLTFSkin::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_skin_root"), &GLTFSkin::get_skin_root);
@@ -51,8 +55,12 @@ void GLTFSkin::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_joint_i_to_bone_i", "joint_i_to_bone_i"), &GLTFSkin::set_joint_i_to_bone_i);
 	ClassDB::bind_method(D_METHOD("get_joint_i_to_name"), &GLTFSkin::get_joint_i_to_name);
 	ClassDB::bind_method(D_METHOD("set_joint_i_to_name", "joint_i_to_name"), &GLTFSkin::set_joint_i_to_name);
+
+#ifdef MODULE_SKELETON_3D_ENABLED
 	ClassDB::bind_method(D_METHOD("get_pandemonium_skin"), &GLTFSkin::get_pandemonium_skin);
 	ClassDB::bind_method(D_METHOD("set_pandemonium_skin", "pandemonium_skin"), &GLTFSkin::set_pandemonium_skin);
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "pandemonium_skin"), "set_pandemonium_skin", "get_pandemonium_skin"); // Ref<Skin>
+#endif
 
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "skin_root"), "set_skin_root", "get_skin_root"); // GLTFNodeIndex
 	ADD_PROPERTY(PropertyInfo(Variant::POOL_INT_ARRAY, "joints_original"), "set_joints_original", "get_joints_original"); // Vector<GLTFNodeIndex>
@@ -63,7 +71,6 @@ void GLTFSkin::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "skeleton"), "set_skeleton", "get_skeleton"); // int
 	ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "joint_i_to_bone_i", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_INTERNAL), "set_joint_i_to_bone_i", "get_joint_i_to_bone_i"); // Map<int,
 	ADD_PROPERTY(PropertyInfo(Variant::DICTIONARY, "joint_i_to_name", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_INTERNAL), "set_joint_i_to_name", "get_joint_i_to_name"); // Map<int,
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "pandemonium_skin"), "set_pandemonium_skin", "get_pandemonium_skin"); // Ref<Skin>
 }
 
 GLTFNodeIndex GLTFSkin::get_skin_root() {
@@ -148,6 +155,7 @@ void GLTFSkin::set_joint_i_to_name(Dictionary p_joint_i_to_name) {
 	}
 }
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 Ref<Skin> GLTFSkin::get_pandemonium_skin() {
 	return pandemonium_skin;
 }
@@ -155,6 +163,7 @@ Ref<Skin> GLTFSkin::get_pandemonium_skin() {
 void GLTFSkin::set_pandemonium_skin(Ref<Skin> p_pandemonium_skin) {
 	pandemonium_skin = p_pandemonium_skin;
 }
+#endif
 
 GLTFSkin::GLTFSkin() {
 }
diff --git a/editor_modules/gltf/gltf_skin.h b/editor_modules/gltf/gltf_skin.h
index f5a6e441a..e9de0bf1b 100644
--- a/editor_modules/gltf/gltf_skin.h
+++ b/editor_modules/gltf/gltf_skin.h
@@ -34,7 +34,13 @@
 
 #include "gltf_document.h"
 
+#include "modules/modules_enabled.gen.h"
+
+#ifdef MODULE_SKELETON_3D_ENABLED
 class Skin;
+#endif
+
+
 
 class GLTFSkin : public Resource {
 	GDCLASS(GLTFSkin, Resource);
@@ -70,9 +76,11 @@ private:
 	Map<int, int> joint_i_to_bone_i;
 	Map<int, StringName> joint_i_to_name;
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 	// The Actual Skin that will be created as a mapping between the IBM's of
 	// this skin to the generated skeleton for the mesh instances.
 	Ref<Skin> pandemonium_skin;
+#endif
 
 protected:
 	static void _bind_methods();
@@ -105,8 +113,10 @@ public:
 	Dictionary get_joint_i_to_name();
 	void set_joint_i_to_name(Dictionary p_joint_i_to_name);
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 	Ref<Skin> get_pandemonium_skin();
 	void set_pandemonium_skin(Ref<Skin> p_pandemonium_skin);
+#endif
 
 	GLTFSkin();
 	~GLTFSkin();
diff --git a/editor_modules/gltf/gltf_state.cpp b/editor_modules/gltf/gltf_state.cpp
index 82beb2be8..7c9818b94 100644
--- a/editor_modules/gltf/gltf_state.cpp
+++ b/editor_modules/gltf/gltf_state.cpp
@@ -30,8 +30,6 @@
 
 #include "gltf_state.h"
 
-#include "scene/resources/skin.h"
-
 void GLTFState::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_json"), &GLTFState::get_json);
 	ClassDB::bind_method(D_METHOD("set_json", "json"), &GLTFState::set_json);
diff --git a/editor_modules/gltf/packed_scene_gltf.cpp b/editor_modules/gltf/packed_scene_gltf.cpp
index fc1daea50..409d93883 100644
--- a/editor_modules/gltf/packed_scene_gltf.cpp
+++ b/editor_modules/gltf/packed_scene_gltf.cpp
@@ -36,7 +36,6 @@
 #include "scene/3d/spatial.h"
 #include "scene/animation/animation_player.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/skin.h"
 
 #include "gltf_document.h"
 
diff --git a/editor_modules/skeleton_editor/SCsub b/editor_modules/skeleton_editor/SCsub
deleted file mode 100644
index 238758ee5..000000000
--- a/editor_modules/skeleton_editor/SCsub
+++ /dev/null
@@ -1,7 +0,0 @@
-Import('env')
-
-env.add_source_files(env.modules_sources,"register_types.cpp")
-
-if env["tools"]:
-    env.add_source_files(env.modules_sources, "skeleton_editor_plugin.cpp")
-
diff --git a/editor_modules/skeleton_editor/config.py b/editor_modules/skeleton_editor/config.py
deleted file mode 100644
index a8a3fb371..000000000
--- a/editor_modules/skeleton_editor/config.py
+++ /dev/null
@@ -1,13 +0,0 @@
-
-def can_build(env, platform):
-    return env["tools"]
-
-def configure(env):
-    pass
-
-def get_doc_classes():
-    return [
-    ]
-
-def get_doc_path():
-    return "doc_classes"
diff --git a/editor_modules/skeleton_editor/register_types.cpp b/editor_modules/skeleton_editor/register_types.cpp
deleted file mode 100644
index 1cad4f167..000000000
--- a/editor_modules/skeleton_editor/register_types.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright (c) 2021 Péter Magyar
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#include "register_types.h"
-
-#ifdef TOOLS_ENABLED
-#include "skeleton_editor_plugin.h"
-#endif
-
-void register_skeleton_editor_types() {
-#ifdef TOOLS_ENABLED
-	EditorPlugins::add_by_type<SkeletonEditorPlugin>();
-#endif
-}
-
-void unregister_skeleton_editor_types() {
-}
diff --git a/editor_modules/skeleton_editor/register_types.h b/editor_modules/skeleton_editor/register_types.h
deleted file mode 100644
index c5e910e01..000000000
--- a/editor_modules/skeleton_editor/register_types.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright (c) 2021 Péter Magyar
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-void register_skeleton_editor_types();
-void unregister_skeleton_editor_types();
diff --git a/modules/skeleton_2d/SCsub b/modules/skeleton_2d/SCsub
index 4355250d2..063d6ec6a 100644
--- a/modules/skeleton_2d/SCsub
+++ b/modules/skeleton_2d/SCsub
@@ -9,7 +9,6 @@ module_env.add_source_files(env.modules_sources,"register_types.cpp")
 module_env.add_source_files(env.modules_sources,"nodes/skeleton_2d.cpp")
 module_env.add_source_files(env.modules_sources,"nodes/physical_bone_2d.cpp")
 
-
 module_env.add_source_files(env.modules_sources,"resources/skeleton_modification_2d.cpp")
 module_env.add_source_files(env.modules_sources,"resources/skeleton_modification_2d_ccdik.cpp")
 module_env.add_source_files(env.modules_sources,"resources/skeleton_modification_2d_fabrik.cpp")
diff --git a/modules/skeleton_2d/config.py b/modules/skeleton_2d/config.py
index 3eb755653..3ded3dbfd 100644
--- a/modules/skeleton_2d/config.py
+++ b/modules/skeleton_2d/config.py
@@ -12,6 +12,7 @@ def get_doc_classes():
     return [
         "Skeleton2D",
         "PhysicalBone2D",
+	"Bone2D",
 
         "SkeletonModificationStack2D",
         
diff --git a/doc/classes/Bone2D.xml b/modules/skeleton_2d/doc_classes/Bone2D.xml
similarity index 100%
rename from doc/classes/Bone2D.xml
rename to modules/skeleton_2d/doc_classes/Bone2D.xml
diff --git a/editor/icons/icon_bone_2_d.svg b/modules/skeleton_2d/icons/icon_bone_2_d.svg
similarity index 100%
rename from editor/icons/icon_bone_2_d.svg
rename to modules/skeleton_2d/icons/icon_bone_2_d.svg
diff --git a/editor_modules/skeleton_editor/.gitignore b/modules/skeleton_3d/.gitignore
similarity index 97%
rename from editor_modules/skeleton_editor/.gitignore
rename to modules/skeleton_3d/.gitignore
index e68a058e1..e795fbef5 100644
--- a/editor_modules/skeleton_editor/.gitignore
+++ b/modules/skeleton_3d/.gitignore
@@ -2,7 +2,6 @@
 *.d
 *.o
 *.meta
-*.pyc
 *.obj
+*.pyc
 *.bc
-
diff --git a/modules/skeleton_3d/SCsub b/modules/skeleton_3d/SCsub
new file mode 100644
index 000000000..3939eda94
--- /dev/null
+++ b/modules/skeleton_3d/SCsub
@@ -0,0 +1,31 @@
+import os
+
+Import('env')
+
+module_env = env.Clone()
+
+module_env.add_source_files(env.modules_sources,"register_types.cpp")
+
+module_env.add_source_files(env.modules_sources,"nodes/skeleton.cpp")
+module_env.add_source_files(env.modules_sources,"resources/skin.cpp")
+
+module_env.add_source_files(env.modules_sources,"nodes/physical_bone.cpp")
+
+module_env.add_source_files(env.modules_sources,"nodes/bone_attachment.cpp")
+
+module_env.add_source_files(env.modules_sources,"nodes/skeleton_ik.cpp")
+
+module_env.add_source_files(env.modules_sources,"resources/skeleton_modification_3d.cpp")
+module_env.add_source_files(env.modules_sources,"resources/skeleton_modification_3d_ccdik.cpp")
+module_env.add_source_files(env.modules_sources,"resources/skeleton_modification_3d_fabrik.cpp")
+module_env.add_source_files(env.modules_sources,"resources/skeleton_modification_3d_jiggle.cpp")
+module_env.add_source_files(env.modules_sources,"resources/skeleton_modification_3d_lookat.cpp")
+module_env.add_source_files(env.modules_sources,"resources/skeleton_modification_3d_stackholder.cpp")
+module_env.add_source_files(env.modules_sources,"resources/skeleton_modification_3d_twoboneik.cpp")
+module_env.add_source_files(env.modules_sources,"resources/skeleton_modification_stack_3d.cpp")
+
+if env["tools"]:
+    env.add_source_files(env.modules_sources, "editor/physical_bone_editor_plugin.cpp")
+    env.add_source_files(env.modules_sources, "editor/skeleton_editor_plugin.cpp")
+    env.add_source_files(env.modules_sources, "editor/skeleton_ik_editor_plugin.cpp")
+    env.add_source_files(env.modules_sources, "editor/physical_bone_plugin.cpp")
diff --git a/modules/skeleton_3d/config.py b/modules/skeleton_3d/config.py
new file mode 100644
index 000000000..3bbfab880
--- /dev/null
+++ b/modules/skeleton_3d/config.py
@@ -0,0 +1,35 @@
+
+
+def can_build(env, platform):
+  return True
+
+
+def configure(env):
+	pass
+
+
+def get_doc_classes():
+    return [
+        "Skeleton",
+        "Skin",
+        "SkinReference",
+
+        "BoneAttachment",
+        
+        "PhysicalBone",
+
+        "SkeletonIK",
+
+        "SkeletonModificationStack3D",
+        
+        "SkeletonModification3D",
+        "SkeletonModification3DCCDIK",
+        "SkeletonModification3DFABRIK",
+        "SkeletonModification3DJiggle",
+        "SkeletonModification3DLookAt",
+        "SkeletonModification3DStackHolder",
+        "SkeletonModification3DTwoBoneIK",
+    ]
+
+def get_doc_path():
+    return "doc_classes"
diff --git a/doc/classes/BoneAttachment.xml b/modules/skeleton_3d/doc_classes/BoneAttachment.xml
similarity index 100%
rename from doc/classes/BoneAttachment.xml
rename to modules/skeleton_3d/doc_classes/BoneAttachment.xml
diff --git a/doc/classes/PhysicalBone.xml b/modules/skeleton_3d/doc_classes/PhysicalBone.xml
similarity index 100%
rename from doc/classes/PhysicalBone.xml
rename to modules/skeleton_3d/doc_classes/PhysicalBone.xml
diff --git a/doc/classes/Skeleton.xml b/modules/skeleton_3d/doc_classes/Skeleton.xml
similarity index 100%
rename from doc/classes/Skeleton.xml
rename to modules/skeleton_3d/doc_classes/Skeleton.xml
diff --git a/doc/classes/SkeletonIK.xml b/modules/skeleton_3d/doc_classes/SkeletonIK.xml
similarity index 100%
rename from doc/classes/SkeletonIK.xml
rename to modules/skeleton_3d/doc_classes/SkeletonIK.xml
diff --git a/doc/classes/SkeletonModification3D.xml b/modules/skeleton_3d/doc_classes/SkeletonModification3D.xml
similarity index 100%
rename from doc/classes/SkeletonModification3D.xml
rename to modules/skeleton_3d/doc_classes/SkeletonModification3D.xml
diff --git a/doc/classes/SkeletonModification3DCCDIK.xml b/modules/skeleton_3d/doc_classes/SkeletonModification3DCCDIK.xml
similarity index 100%
rename from doc/classes/SkeletonModification3DCCDIK.xml
rename to modules/skeleton_3d/doc_classes/SkeletonModification3DCCDIK.xml
diff --git a/doc/classes/SkeletonModification3DFABRIK.xml b/modules/skeleton_3d/doc_classes/SkeletonModification3DFABRIK.xml
similarity index 100%
rename from doc/classes/SkeletonModification3DFABRIK.xml
rename to modules/skeleton_3d/doc_classes/SkeletonModification3DFABRIK.xml
diff --git a/doc/classes/SkeletonModification3DJiggle.xml b/modules/skeleton_3d/doc_classes/SkeletonModification3DJiggle.xml
similarity index 100%
rename from doc/classes/SkeletonModification3DJiggle.xml
rename to modules/skeleton_3d/doc_classes/SkeletonModification3DJiggle.xml
diff --git a/doc/classes/SkeletonModification3DLookAt.xml b/modules/skeleton_3d/doc_classes/SkeletonModification3DLookAt.xml
similarity index 100%
rename from doc/classes/SkeletonModification3DLookAt.xml
rename to modules/skeleton_3d/doc_classes/SkeletonModification3DLookAt.xml
diff --git a/doc/classes/SkeletonModification3DStackHolder.xml b/modules/skeleton_3d/doc_classes/SkeletonModification3DStackHolder.xml
similarity index 100%
rename from doc/classes/SkeletonModification3DStackHolder.xml
rename to modules/skeleton_3d/doc_classes/SkeletonModification3DStackHolder.xml
diff --git a/doc/classes/SkeletonModification3DTwoBoneIK.xml b/modules/skeleton_3d/doc_classes/SkeletonModification3DTwoBoneIK.xml
similarity index 100%
rename from doc/classes/SkeletonModification3DTwoBoneIK.xml
rename to modules/skeleton_3d/doc_classes/SkeletonModification3DTwoBoneIK.xml
diff --git a/doc/classes/SkeletonModificationStack2D.xml b/modules/skeleton_3d/doc_classes/SkeletonModificationStack2D.xml
similarity index 100%
rename from doc/classes/SkeletonModificationStack2D.xml
rename to modules/skeleton_3d/doc_classes/SkeletonModificationStack2D.xml
diff --git a/doc/classes/SkeletonModificationStack3D.xml b/modules/skeleton_3d/doc_classes/SkeletonModificationStack3D.xml
similarity index 100%
rename from doc/classes/SkeletonModificationStack3D.xml
rename to modules/skeleton_3d/doc_classes/SkeletonModificationStack3D.xml
diff --git a/doc/classes/Skin.xml b/modules/skeleton_3d/doc_classes/Skin.xml
similarity index 100%
rename from doc/classes/Skin.xml
rename to modules/skeleton_3d/doc_classes/Skin.xml
diff --git a/doc/classes/SkinReference.xml b/modules/skeleton_3d/doc_classes/SkinReference.xml
similarity index 100%
rename from doc/classes/SkinReference.xml
rename to modules/skeleton_3d/doc_classes/SkinReference.xml
diff --git a/modules/skeleton_3d/editor/physical_bone_editor_plugin.cpp b/modules/skeleton_3d/editor/physical_bone_editor_plugin.cpp
new file mode 100644
index 000000000..ac285cdae
--- /dev/null
+++ b/modules/skeleton_3d/editor/physical_bone_editor_plugin.cpp
@@ -0,0 +1,139 @@
+
+#include "physical_bone_editor_plugin.h"
+
+#include "editor/editor_settings.h"
+
+#include "../nodes/skeleton.h"
+#include "../resources/skin.h"
+#include "../nodes/physical_bone.h"
+
+PhysicalBoneSpatialGizmoPlugin::PhysicalBoneSpatialGizmoPlugin() {
+	create_material("joint_material", EDITOR_DEF("editors/3d_gizmos/gizmo_colors/joint", Color(0.5, 0.8, 1)));
+}
+
+bool PhysicalBoneSpatialGizmoPlugin::has_gizmo(Spatial *p_spatial) {
+	return Object::cast_to<PhysicalBone>(p_spatial) != nullptr;
+}
+
+String PhysicalBoneSpatialGizmoPlugin::get_gizmo_name() const {
+	return "PhysicalBones";
+}
+
+int PhysicalBoneSpatialGizmoPlugin::get_priority() const {
+	return -1;
+}
+
+void PhysicalBoneSpatialGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) {
+	p_gizmo->clear();
+
+	PhysicalBone *physical_bone = Object::cast_to<PhysicalBone>(p_gizmo->get_spatial_node());
+
+	if (!physical_bone) {
+		return;
+	}
+
+	Skeleton *sk(physical_bone->find_skeleton_parent());
+	if (!sk) {
+		return;
+	}
+
+	PhysicalBone *pb(sk->get_physical_bone(physical_bone->get_bone_id()));
+	if (!pb) {
+		return;
+	}
+
+	PhysicalBone *pbp(sk->get_physical_bone_parent(physical_bone->get_bone_id()));
+	if (!pbp) {
+		return;
+	}
+
+	Vector<Vector3> points;
+
+	switch (physical_bone->get_joint_type()) {
+		case PhysicalBone::JOINT_TYPE_PIN: {
+			JointSpatialGizmoPlugin::CreatePinJointGizmo(physical_bone->get_joint_offset(), points);
+		} break;
+		case PhysicalBone::JOINT_TYPE_CONE: {
+			const PhysicalBone::ConeJointData *cjd(static_cast<const PhysicalBone::ConeJointData *>(physical_bone->get_joint_data()));
+			JointSpatialGizmoPlugin::CreateConeTwistJointGizmo(
+					physical_bone->get_joint_offset(),
+					physical_bone->get_global_transform() * physical_bone->get_joint_offset(),
+					pb->get_global_transform(),
+					pbp->get_global_transform(),
+					cjd->swing_span,
+					cjd->twist_span,
+					&points,
+					&points);
+		} break;
+		case PhysicalBone::JOINT_TYPE_HINGE: {
+			const PhysicalBone::HingeJointData *hjd(static_cast<const PhysicalBone::HingeJointData *>(physical_bone->get_joint_data()));
+			JointSpatialGizmoPlugin::CreateHingeJointGizmo(
+					physical_bone->get_joint_offset(),
+					physical_bone->get_global_transform() * physical_bone->get_joint_offset(),
+					pb->get_global_transform(),
+					pbp->get_global_transform(),
+					hjd->angular_limit_lower,
+					hjd->angular_limit_upper,
+					hjd->angular_limit_enabled,
+					points,
+					&points,
+					&points);
+		} break;
+		case PhysicalBone::JOINT_TYPE_SLIDER: {
+			const PhysicalBone::SliderJointData *sjd(static_cast<const PhysicalBone::SliderJointData *>(physical_bone->get_joint_data()));
+			JointSpatialGizmoPlugin::CreateSliderJointGizmo(
+					physical_bone->get_joint_offset(),
+					physical_bone->get_global_transform() * physical_bone->get_joint_offset(),
+					pb->get_global_transform(),
+					pbp->get_global_transform(),
+					sjd->angular_limit_lower,
+					sjd->angular_limit_upper,
+					sjd->linear_limit_lower,
+					sjd->linear_limit_upper,
+					points,
+					&points,
+					&points);
+		} break;
+		case PhysicalBone::JOINT_TYPE_6DOF: {
+			const PhysicalBone::SixDOFJointData *sdofjd(static_cast<const PhysicalBone::SixDOFJointData *>(physical_bone->get_joint_data()));
+			JointSpatialGizmoPlugin::CreateGeneric6DOFJointGizmo(
+					physical_bone->get_joint_offset(),
+
+					physical_bone->get_global_transform() * physical_bone->get_joint_offset(),
+					pb->get_global_transform(),
+					pbp->get_global_transform(),
+
+					sdofjd->axis_data[0].angular_limit_lower,
+					sdofjd->axis_data[0].angular_limit_upper,
+					sdofjd->axis_data[0].linear_limit_lower,
+					sdofjd->axis_data[0].linear_limit_upper,
+					sdofjd->axis_data[0].angular_limit_enabled,
+					sdofjd->axis_data[0].linear_limit_enabled,
+
+					sdofjd->axis_data[1].angular_limit_lower,
+					sdofjd->axis_data[1].angular_limit_upper,
+					sdofjd->axis_data[1].linear_limit_lower,
+					sdofjd->axis_data[1].linear_limit_upper,
+					sdofjd->axis_data[1].angular_limit_enabled,
+					sdofjd->axis_data[1].linear_limit_enabled,
+
+					sdofjd->axis_data[2].angular_limit_lower,
+					sdofjd->axis_data[2].angular_limit_upper,
+					sdofjd->axis_data[2].linear_limit_lower,
+					sdofjd->axis_data[2].linear_limit_upper,
+					sdofjd->axis_data[2].angular_limit_enabled,
+					sdofjd->axis_data[2].linear_limit_enabled,
+
+					points,
+					&points,
+					&points);
+		} break;
+		default:
+			return;
+	}
+
+	Ref<Material> material = get_material("joint_material", p_gizmo);
+
+	p_gizmo->add_collision_segments(points);
+	p_gizmo->add_lines(points, material);
+}
diff --git a/modules/skeleton_3d/editor/physical_bone_editor_plugin.h b/modules/skeleton_3d/editor/physical_bone_editor_plugin.h
new file mode 100644
index 000000000..e65e46c72
--- /dev/null
+++ b/modules/skeleton_3d/editor/physical_bone_editor_plugin.h
@@ -0,0 +1,21 @@
+#ifndef PHYSICAL_BONE_EDITOR_PLUGIN_H
+#define PHYSICAL_BONE_EDITOR_PLUGIN_H
+
+#include "core/string/ustring.h"
+
+#include "editor/spatial_editor_gizmos.h"
+
+class PhysicalBoneSpatialGizmoPlugin : public EditorSpatialGizmoPlugin {
+	GDCLASS(PhysicalBoneSpatialGizmoPlugin, EditorSpatialGizmoPlugin);
+
+public:
+	bool has_gizmo(Spatial *p_spatial);
+	String get_gizmo_name() const;
+	int get_priority() const;
+	void redraw(EditorSpatialGizmo *p_gizmo);
+
+	PhysicalBoneSpatialGizmoPlugin();
+};
+
+
+#endif 
diff --git a/editor/plugins/physical_bone_plugin.cpp b/modules/skeleton_3d/editor/physical_bone_plugin.cpp
similarity index 99%
rename from editor/plugins/physical_bone_plugin.cpp
rename to modules/skeleton_3d/editor/physical_bone_plugin.cpp
index 5acef4235..e71908523 100644
--- a/editor/plugins/physical_bone_plugin.cpp
+++ b/modules/skeleton_3d/editor/physical_bone_plugin.cpp
@@ -32,6 +32,7 @@
 
 #include "editor/plugins/spatial_editor_plugin.h"
 #include "scene/3d/physics_body.h"
+#include "../nodes/physical_bone.h"
 #include "core/object/class_db.h"
 #include "core/error/error_macros.h"
 #include "core/os/memory.h"
diff --git a/editor/plugins/physical_bone_plugin.h b/modules/skeleton_3d/editor/physical_bone_plugin.h
similarity index 100%
rename from editor/plugins/physical_bone_plugin.h
rename to modules/skeleton_3d/editor/physical_bone_plugin.h
diff --git a/editor_modules/skeleton_editor/skeleton_editor_plugin.cpp b/modules/skeleton_3d/editor/skeleton_editor_plugin.cpp
similarity index 99%
rename from editor_modules/skeleton_editor/skeleton_editor_plugin.cpp
rename to modules/skeleton_3d/editor/skeleton_editor_plugin.cpp
index 3d3bbc5a1..8cd8a11ae 100644
--- a/editor_modules/skeleton_editor/skeleton_editor_plugin.cpp
+++ b/modules/skeleton_3d/editor/skeleton_editor_plugin.cpp
@@ -30,6 +30,7 @@
 
 #include "skeleton_editor_plugin.h"
 
+#include "../resources/skin.h"
 #include "core/io/resource_saver.h"
 #include "core/os/keyboard.h"
 #include "editor/animation_track_editor.h"
@@ -44,6 +45,7 @@
 #include "scene/3d/collision_shape.h"
 #include "scene/3d/mesh_instance.h"
 #include "scene/3d/physics_body.h"
+#include "../nodes/physical_bone.h"
 #include "scene/3d/physics_joint.h"
 #include "scene/gui/check_box.h"
 #include "scene/gui/grid_container.h"
@@ -54,10 +56,11 @@
 #include "scene/gui/tree.h"
 #include "scene/main/viewport.h"
 #include "scene/resources/capsule_shape.h"
-#include "scene/resources/skin.h"
 #include "scene/resources/sphere_shape.h"
 #include "scene/resources/surface_tool.h"
 
+#include "physical_bone_editor_plugin.h"
+
 #define DISTANCE_DEFAULT 4
 
 #define GIZMO_ARROW_SIZE 0.35
@@ -1293,6 +1296,7 @@ void SkeletonEditor::_bone_enabled_changed(const int p_bone_id) {
 void SkeletonEditorPlugin::_notification(int p_what) {
 	if (p_what == NOTIFICATION_ENTER_TREE) {
 		add_spatial_gizmo_plugin(Ref<SkeletonGizmoPlugin>(memnew(SkeletonGizmoPlugin)));
+		add_spatial_gizmo_plugin(Ref<PhysicalBoneSpatialGizmoPlugin>(memnew(PhysicalBoneSpatialGizmoPlugin)));
 	}
 }
 
diff --git a/editor_modules/skeleton_editor/skeleton_editor_plugin.h b/modules/skeleton_3d/editor/skeleton_editor_plugin.h
similarity index 99%
rename from editor_modules/skeleton_editor/skeleton_editor_plugin.h
rename to modules/skeleton_3d/editor/skeleton_editor_plugin.h
index d3acfd003..92c9633dd 100644
--- a/editor_modules/skeleton_editor/skeleton_editor_plugin.h
+++ b/modules/skeleton_3d/editor/skeleton_editor_plugin.h
@@ -37,7 +37,7 @@
 #include "editor/spatial_editor_gizmos.h"
 #include "scene/3d/camera.h"
 #include "scene/3d/mesh_instance.h"
-#include "scene/3d/skeleton.h"
+#include "../nodes/skeleton.h"
 #include "scene/resources/immediate_mesh.h"
 
 class EditorInspectorPluginSkeleton;
diff --git a/editor/plugins/skeleton_ik_editor_plugin.cpp b/modules/skeleton_3d/editor/skeleton_ik_editor_plugin.cpp
similarity index 98%
rename from editor/plugins/skeleton_ik_editor_plugin.cpp
rename to modules/skeleton_3d/editor/skeleton_ik_editor_plugin.cpp
index 0736d43ba..479d983f6 100644
--- a/editor/plugins/skeleton_ik_editor_plugin.cpp
+++ b/modules/skeleton_3d/editor/skeleton_ik_editor_plugin.cpp
@@ -30,8 +30,8 @@
 
 #include "skeleton_ik_editor_plugin.h"
 
-#include "scene/3d/skeleton.h"
-#include "scene/animation/skeleton_ik.h"
+#include "../nodes/skeleton.h"
+#include "../nodes/skeleton_ik.h"
 #include "core/object/class_db.h"
 #include "core/os/memory.h"
 #include "editor/editor_node.h"
diff --git a/editor/plugins/skeleton_ik_editor_plugin.h b/modules/skeleton_3d/editor/skeleton_ik_editor_plugin.h
similarity index 100%
rename from editor/plugins/skeleton_ik_editor_plugin.h
rename to modules/skeleton_3d/editor/skeleton_ik_editor_plugin.h
diff --git a/editor_modules/skeleton_editor/icons/icon_editor_bone_handle.svg b/modules/skeleton_3d/icons/icon_editor_bone_handle.svg
similarity index 100%
rename from editor_modules/skeleton_editor/icons/icon_editor_bone_handle.svg
rename to modules/skeleton_3d/icons/icon_editor_bone_handle.svg
diff --git a/editor/icons/icon_physical_bone.svg b/modules/skeleton_3d/icons/icon_physical_bone.svg
similarity index 100%
rename from editor/icons/icon_physical_bone.svg
rename to modules/skeleton_3d/icons/icon_physical_bone.svg
diff --git a/editor/icons/icon_skeleton.svg b/modules/skeleton_3d/icons/icon_skeleton.svg
similarity index 100%
rename from editor/icons/icon_skeleton.svg
rename to modules/skeleton_3d/icons/icon_skeleton.svg
diff --git a/editor/icons/icon_skeleton_i_k.svg b/modules/skeleton_3d/icons/icon_skeleton_i_k.svg
similarity index 100%
rename from editor/icons/icon_skeleton_i_k.svg
rename to modules/skeleton_3d/icons/icon_skeleton_i_k.svg
diff --git a/editor_modules/skeleton_editor/icons/icon_tool_bone_move.svg b/modules/skeleton_3d/icons/icon_tool_bone_move.svg
similarity index 100%
rename from editor_modules/skeleton_editor/icons/icon_tool_bone_move.svg
rename to modules/skeleton_3d/icons/icon_tool_bone_move.svg
diff --git a/editor_modules/skeleton_editor/icons/icon_tool_bone_rest.svg b/modules/skeleton_3d/icons/icon_tool_bone_rest.svg
similarity index 100%
rename from editor_modules/skeleton_editor/icons/icon_tool_bone_rest.svg
rename to modules/skeleton_3d/icons/icon_tool_bone_rest.svg
diff --git a/editor_modules/skeleton_editor/icons/icon_tool_bone_rotate.svg b/modules/skeleton_3d/icons/icon_tool_bone_rotate.svg
similarity index 100%
rename from editor_modules/skeleton_editor/icons/icon_tool_bone_rotate.svg
rename to modules/skeleton_3d/icons/icon_tool_bone_rotate.svg
diff --git a/editor_modules/skeleton_editor/icons/icon_tool_bone_scale.svg b/modules/skeleton_3d/icons/icon_tool_bone_scale.svg
similarity index 100%
rename from editor_modules/skeleton_editor/icons/icon_tool_bone_scale.svg
rename to modules/skeleton_3d/icons/icon_tool_bone_scale.svg
diff --git a/editor_modules/skeleton_editor/icons/icon_tool_bone_select.svg b/modules/skeleton_3d/icons/icon_tool_bone_select.svg
similarity index 100%
rename from editor_modules/skeleton_editor/icons/icon_tool_bone_select.svg
rename to modules/skeleton_3d/icons/icon_tool_bone_select.svg
diff --git a/scene/3d/bone_attachment.cpp b/modules/skeleton_3d/nodes/bone_attachment.cpp
similarity index 100%
rename from scene/3d/bone_attachment.cpp
rename to modules/skeleton_3d/nodes/bone_attachment.cpp
diff --git a/scene/3d/bone_attachment.h b/modules/skeleton_3d/nodes/bone_attachment.h
similarity index 99%
rename from scene/3d/bone_attachment.h
rename to modules/skeleton_3d/nodes/bone_attachment.h
index 91a9f4f55..df06a0cf3 100644
--- a/scene/3d/bone_attachment.h
+++ b/modules/skeleton_3d/nodes/bone_attachment.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/3d/skeleton.h"
+#include "skeleton.h"
 
 class BoneAttachment : public Spatial {
 	GDCLASS(BoneAttachment, Spatial);
diff --git a/modules/skeleton_3d/nodes/physical_bone.cpp b/modules/skeleton_3d/nodes/physical_bone.cpp
new file mode 100644
index 000000000..ae711abd6
--- /dev/null
+++ b/modules/skeleton_3d/nodes/physical_bone.cpp
@@ -0,0 +1,1242 @@
+/*************************************************************************/
+/*  physics_body.cpp                                                     */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "physical_bone.h"
+
+#include "core/core_string_names.h"
+#include "core/config/engine.h"
+#include "core/containers/list.h"
+#include "core/object/method_bind_ext.gen.inc"
+#include "core/object/object.h"
+#include "core/config/project_settings.h"
+#include "core/containers/rid.h"
+#include "scene/resources/physics_material.h"
+#include "scene/scene_string_names.h"
+#include "skeleton.h"
+
+#ifdef TOOLS_ENABLED
+#include "editor/plugins/spatial_editor_plugin.h"
+#endif
+
+bool PhysicalBone::JointData::_set(const StringName &p_name, const Variant &p_value, RID j) {
+	return false;
+}
+
+bool PhysicalBone::JointData::_get(const StringName &p_name, Variant &r_ret) const {
+	return false;
+}
+
+void PhysicalBone::JointData::_get_property_list(List<PropertyInfo> *p_list) const {
+}
+
+void PhysicalBone::apply_central_impulse(const Vector3 &p_impulse) {
+	PhysicsServer::get_singleton()->body_apply_central_impulse(get_rid(), p_impulse);
+}
+
+void PhysicalBone::apply_impulse(const Vector3 &p_pos, const Vector3 &p_impulse) {
+	PhysicsServer::get_singleton()->body_apply_impulse(get_rid(), p_pos, p_impulse);
+}
+
+void PhysicalBone::reset_physics_simulation_state() {
+	if (simulate_physics) {
+		_start_physics_simulation();
+	} else {
+		_stop_physics_simulation();
+	}
+}
+
+void PhysicalBone::reset_to_rest_position() {
+	if (parent_skeleton) {
+		if (-1 == bone_id) {
+			set_global_transform(parent_skeleton->get_global_transform() * body_offset);
+		} else {
+			set_global_transform(parent_skeleton->get_global_transform() * parent_skeleton->get_bone_global_pose(bone_id) * body_offset);
+		}
+	}
+}
+
+bool PhysicalBone::PinJointData::_set(const StringName &p_name, const Variant &p_value, RID j) {
+	if (JointData::_set(p_name, p_value, j)) {
+		return true;
+	}
+
+	if ("joint_constraints/bias" == p_name) {
+		bias = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->pin_joint_set_param(j, PhysicsServer::PIN_JOINT_BIAS, bias);
+		}
+
+	} else if ("joint_constraints/damping" == p_name) {
+		damping = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->pin_joint_set_param(j, PhysicsServer::PIN_JOINT_DAMPING, damping);
+		}
+
+	} else if ("joint_constraints/impulse_clamp" == p_name) {
+		impulse_clamp = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->pin_joint_set_param(j, PhysicsServer::PIN_JOINT_IMPULSE_CLAMP, impulse_clamp);
+		}
+
+	} else {
+		return false;
+	}
+
+	return true;
+}
+
+bool PhysicalBone::PinJointData::_get(const StringName &p_name, Variant &r_ret) const {
+	if (JointData::_get(p_name, r_ret)) {
+		return true;
+	}
+
+	if ("joint_constraints/bias" == p_name) {
+		r_ret = bias;
+	} else if ("joint_constraints/damping" == p_name) {
+		r_ret = damping;
+	} else if ("joint_constraints/impulse_clamp" == p_name) {
+		r_ret = impulse_clamp;
+	} else {
+		return false;
+	}
+
+	return true;
+}
+
+void PhysicalBone::PinJointData::_get_property_list(List<PropertyInfo> *p_list) const {
+	JointData::_get_property_list(p_list);
+
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/bias", PROPERTY_HINT_RANGE, "0.01,0.99,0.01"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/damping", PROPERTY_HINT_RANGE, "0.01,8.0,0.01"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/impulse_clamp", PROPERTY_HINT_RANGE, "0.0,64.0,0.01"));
+}
+
+bool PhysicalBone::ConeJointData::_set(const StringName &p_name, const Variant &p_value, RID j) {
+	if (JointData::_set(p_name, p_value, j)) {
+		return true;
+	}
+
+	if ("joint_constraints/swing_span" == p_name) {
+		swing_span = Math::deg2rad(real_t(p_value));
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->cone_twist_joint_set_param(j, PhysicsServer::CONE_TWIST_JOINT_SWING_SPAN, swing_span);
+		}
+
+	} else if ("joint_constraints/twist_span" == p_name) {
+		twist_span = Math::deg2rad(real_t(p_value));
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->cone_twist_joint_set_param(j, PhysicsServer::CONE_TWIST_JOINT_TWIST_SPAN, twist_span);
+		}
+
+	} else if ("joint_constraints/bias" == p_name) {
+		bias = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->cone_twist_joint_set_param(j, PhysicsServer::CONE_TWIST_JOINT_BIAS, bias);
+		}
+
+	} else if ("joint_constraints/softness" == p_name) {
+		softness = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->cone_twist_joint_set_param(j, PhysicsServer::CONE_TWIST_JOINT_SOFTNESS, softness);
+		}
+
+	} else if ("joint_constraints/relaxation" == p_name) {
+		relaxation = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->cone_twist_joint_set_param(j, PhysicsServer::CONE_TWIST_JOINT_RELAXATION, relaxation);
+		}
+
+	} else {
+		return false;
+	}
+
+	return true;
+}
+
+bool PhysicalBone::ConeJointData::_get(const StringName &p_name, Variant &r_ret) const {
+	if (JointData::_get(p_name, r_ret)) {
+		return true;
+	}
+
+	if ("joint_constraints/swing_span" == p_name) {
+		r_ret = Math::rad2deg(swing_span);
+	} else if ("joint_constraints/twist_span" == p_name) {
+		r_ret = Math::rad2deg(twist_span);
+	} else if ("joint_constraints/bias" == p_name) {
+		r_ret = bias;
+	} else if ("joint_constraints/softness" == p_name) {
+		r_ret = softness;
+	} else if ("joint_constraints/relaxation" == p_name) {
+		r_ret = relaxation;
+	} else {
+		return false;
+	}
+
+	return true;
+}
+
+void PhysicalBone::ConeJointData::_get_property_list(List<PropertyInfo> *p_list) const {
+	JointData::_get_property_list(p_list);
+
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/swing_span", PROPERTY_HINT_RANGE, "-180,180,0.01"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/twist_span", PROPERTY_HINT_RANGE, "-40000,40000,0.1,or_lesser,or_greater"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/bias", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/softness", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/relaxation", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"));
+}
+
+bool PhysicalBone::HingeJointData::_set(const StringName &p_name, const Variant &p_value, RID j) {
+	if (JointData::_set(p_name, p_value, j)) {
+		return true;
+	}
+
+	if ("joint_constraints/angular_limit_enabled" == p_name) {
+		angular_limit_enabled = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->hinge_joint_set_flag(j, PhysicsServer::HINGE_JOINT_FLAG_USE_LIMIT, angular_limit_enabled);
+		}
+
+	} else if ("joint_constraints/angular_limit_upper" == p_name) {
+		angular_limit_upper = Math::deg2rad(real_t(p_value));
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->hinge_joint_set_param(j, PhysicsServer::HINGE_JOINT_LIMIT_UPPER, angular_limit_upper);
+		}
+
+	} else if ("joint_constraints/angular_limit_lower" == p_name) {
+		angular_limit_lower = Math::deg2rad(real_t(p_value));
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->hinge_joint_set_param(j, PhysicsServer::HINGE_JOINT_LIMIT_LOWER, angular_limit_lower);
+		}
+
+	} else if ("joint_constraints/angular_limit_bias" == p_name) {
+		angular_limit_bias = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->hinge_joint_set_param(j, PhysicsServer::HINGE_JOINT_LIMIT_BIAS, angular_limit_bias);
+		}
+
+	} else if ("joint_constraints/angular_limit_softness" == p_name) {
+		angular_limit_softness = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->hinge_joint_set_param(j, PhysicsServer::HINGE_JOINT_LIMIT_SOFTNESS, angular_limit_softness);
+		}
+
+	} else if ("joint_constraints/angular_limit_relaxation" == p_name) {
+		angular_limit_relaxation = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->hinge_joint_set_param(j, PhysicsServer::HINGE_JOINT_LIMIT_RELAXATION, angular_limit_relaxation);
+		}
+
+	} else {
+		return false;
+	}
+
+	return true;
+}
+
+bool PhysicalBone::HingeJointData::_get(const StringName &p_name, Variant &r_ret) const {
+	if (JointData::_get(p_name, r_ret)) {
+		return true;
+	}
+
+	if ("joint_constraints/angular_limit_enabled" == p_name) {
+		r_ret = angular_limit_enabled;
+	} else if ("joint_constraints/angular_limit_upper" == p_name) {
+		r_ret = Math::rad2deg(angular_limit_upper);
+	} else if ("joint_constraints/angular_limit_lower" == p_name) {
+		r_ret = Math::rad2deg(angular_limit_lower);
+	} else if ("joint_constraints/angular_limit_bias" == p_name) {
+		r_ret = angular_limit_bias;
+	} else if ("joint_constraints/angular_limit_softness" == p_name) {
+		r_ret = angular_limit_softness;
+	} else if ("joint_constraints/angular_limit_relaxation" == p_name) {
+		r_ret = angular_limit_relaxation;
+	} else {
+		return false;
+	}
+
+	return true;
+}
+
+void PhysicalBone::HingeJointData::_get_property_list(List<PropertyInfo> *p_list) const {
+	JointData::_get_property_list(p_list);
+
+	p_list->push_back(PropertyInfo(Variant::BOOL, "joint_constraints/angular_limit_enabled"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_upper", PROPERTY_HINT_RANGE, "-180,180,0.01"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_lower", PROPERTY_HINT_RANGE, "-180,180,0.01"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_bias", PROPERTY_HINT_RANGE, "0.01,0.99,0.01"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_softness", PROPERTY_HINT_RANGE, "0.01,16,0.01"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_relaxation", PROPERTY_HINT_RANGE, "0.01,16,0.01"));
+}
+
+bool PhysicalBone::SliderJointData::_set(const StringName &p_name, const Variant &p_value, RID j) {
+	if (JointData::_set(p_name, p_value, j)) {
+		return true;
+	}
+
+	if ("joint_constraints/linear_limit_upper" == p_name) {
+		linear_limit_upper = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_UPPER, linear_limit_upper);
+		}
+
+	} else if ("joint_constraints/linear_limit_lower" == p_name) {
+		linear_limit_lower = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_LOWER, linear_limit_lower);
+		}
+
+	} else if ("joint_constraints/linear_limit_softness" == p_name) {
+		linear_limit_softness = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_SOFTNESS, linear_limit_softness);
+		}
+
+	} else if ("joint_constraints/linear_limit_restitution" == p_name) {
+		linear_limit_restitution = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_RESTITUTION, linear_limit_restitution);
+		}
+
+	} else if ("joint_constraints/linear_limit_damping" == p_name) {
+		linear_limit_damping = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_DAMPING, linear_limit_restitution);
+		}
+
+	} else if ("joint_constraints/angular_limit_upper" == p_name) {
+		angular_limit_upper = Math::deg2rad(real_t(p_value));
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_UPPER, angular_limit_upper);
+		}
+
+	} else if ("joint_constraints/angular_limit_lower" == p_name) {
+		angular_limit_lower = Math::deg2rad(real_t(p_value));
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_LOWER, angular_limit_lower);
+		}
+
+	} else if ("joint_constraints/angular_limit_softness" == p_name) {
+		angular_limit_softness = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_SOFTNESS, angular_limit_softness);
+		}
+
+	} else if ("joint_constraints/angular_limit_restitution" == p_name) {
+		angular_limit_restitution = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_SOFTNESS, angular_limit_softness);
+		}
+
+	} else if ("joint_constraints/angular_limit_damping" == p_name) {
+		angular_limit_damping = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_DAMPING, angular_limit_damping);
+		}
+
+	} else {
+		return false;
+	}
+
+	return true;
+}
+
+bool PhysicalBone::SliderJointData::_get(const StringName &p_name, Variant &r_ret) const {
+	if (JointData::_get(p_name, r_ret)) {
+		return true;
+	}
+
+	if ("joint_constraints/linear_limit_upper" == p_name) {
+		r_ret = linear_limit_upper;
+	} else if ("joint_constraints/linear_limit_lower" == p_name) {
+		r_ret = linear_limit_lower;
+	} else if ("joint_constraints/linear_limit_softness" == p_name) {
+		r_ret = linear_limit_softness;
+	} else if ("joint_constraints/linear_limit_restitution" == p_name) {
+		r_ret = linear_limit_restitution;
+	} else if ("joint_constraints/linear_limit_damping" == p_name) {
+		r_ret = linear_limit_damping;
+	} else if ("joint_constraints/angular_limit_upper" == p_name) {
+		r_ret = Math::rad2deg(angular_limit_upper);
+	} else if ("joint_constraints/angular_limit_lower" == p_name) {
+		r_ret = Math::rad2deg(angular_limit_lower);
+	} else if ("joint_constraints/angular_limit_softness" == p_name) {
+		r_ret = angular_limit_softness;
+	} else if ("joint_constraints/angular_limit_restitution" == p_name) {
+		r_ret = angular_limit_restitution;
+	} else if ("joint_constraints/angular_limit_damping" == p_name) {
+		r_ret = angular_limit_damping;
+	} else {
+		return false;
+	}
+
+	return true;
+}
+
+void PhysicalBone::SliderJointData::_get_property_list(List<PropertyInfo> *p_list) const {
+	JointData::_get_property_list(p_list);
+
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/linear_limit_upper"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/linear_limit_lower"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/linear_limit_softness", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/linear_limit_restitution", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/linear_limit_damping", PROPERTY_HINT_RANGE, "0,16.0,0.01"));
+
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_upper", PROPERTY_HINT_RANGE, "-180,180,0.01"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_lower", PROPERTY_HINT_RANGE, "-180,180,0.01"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_softness", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_restitution", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"));
+	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_damping", PROPERTY_HINT_RANGE, "0,16.0,0.01"));
+}
+
+bool PhysicalBone::SixDOFJointData::_set(const StringName &p_name, const Variant &p_value, RID j) {
+	if (JointData::_set(p_name, p_value, j)) {
+		return true;
+	}
+
+	String path = p_name;
+
+	if (!path.begins_with("joint_constraints/")) {
+		return false;
+	}
+
+	Vector3::Axis axis;
+	{
+		const String axis_s = path.get_slicec('/', 1);
+		if ("x" == axis_s) {
+			axis = Vector3::AXIS_X;
+		} else if ("y" == axis_s) {
+			axis = Vector3::AXIS_Y;
+		} else if ("z" == axis_s) {
+			axis = Vector3::AXIS_Z;
+		} else {
+			return false;
+		}
+	}
+
+	String var_name = path.get_slicec('/', 2);
+
+	if ("linear_limit_enabled" == var_name) {
+		axis_data[axis].linear_limit_enabled = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_flag(j, axis, PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_LIMIT, axis_data[axis].linear_limit_enabled);
+		}
+
+	} else if ("linear_limit_upper" == var_name) {
+		axis_data[axis].linear_limit_upper = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_LINEAR_UPPER_LIMIT, axis_data[axis].linear_limit_upper);
+		}
+
+	} else if ("linear_limit_lower" == var_name) {
+		axis_data[axis].linear_limit_lower = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_LINEAR_LOWER_LIMIT, axis_data[axis].linear_limit_lower);
+		}
+
+	} else if ("linear_limit_softness" == var_name) {
+		axis_data[axis].linear_limit_softness = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_LINEAR_LIMIT_SOFTNESS, axis_data[axis].linear_limit_softness);
+		}
+
+	} else if ("linear_spring_enabled" == var_name) {
+		axis_data[axis].linear_spring_enabled = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_flag(j, axis, PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_SPRING, axis_data[axis].linear_spring_enabled);
+		}
+
+	} else if ("linear_spring_stiffness" == var_name) {
+		axis_data[axis].linear_spring_stiffness = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_STIFFNESS, axis_data[axis].linear_spring_stiffness);
+		}
+
+	} else if ("linear_spring_damping" == var_name) {
+		axis_data[axis].linear_spring_damping = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_DAMPING, axis_data[axis].linear_spring_damping);
+		}
+
+	} else if ("linear_equilibrium_point" == var_name) {
+		axis_data[axis].linear_equilibrium_point = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_EQUILIBRIUM_POINT, axis_data[axis].linear_equilibrium_point);
+		}
+
+	} else if ("linear_restitution" == var_name) {
+		axis_data[axis].linear_restitution = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_LINEAR_RESTITUTION, axis_data[axis].linear_restitution);
+		}
+
+	} else if ("linear_damping" == var_name) {
+		axis_data[axis].linear_damping = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_LINEAR_DAMPING, axis_data[axis].linear_damping);
+		}
+
+	} else if ("angular_limit_enabled" == var_name) {
+		axis_data[axis].angular_limit_enabled = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_flag(j, axis, PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_LIMIT, axis_data[axis].angular_limit_enabled);
+		}
+
+	} else if ("angular_limit_upper" == var_name) {
+		axis_data[axis].angular_limit_upper = Math::deg2rad(real_t(p_value));
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_UPPER_LIMIT, axis_data[axis].angular_limit_upper);
+		}
+
+	} else if ("angular_limit_lower" == var_name) {
+		axis_data[axis].angular_limit_lower = Math::deg2rad(real_t(p_value));
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_LOWER_LIMIT, axis_data[axis].angular_limit_lower);
+		}
+
+	} else if ("angular_limit_softness" == var_name) {
+		axis_data[axis].angular_limit_softness = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_LIMIT_SOFTNESS, axis_data[axis].angular_limit_softness);
+		}
+
+	} else if ("angular_restitution" == var_name) {
+		axis_data[axis].angular_restitution = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_RESTITUTION, axis_data[axis].angular_restitution);
+		}
+
+	} else if ("angular_damping" == var_name) {
+		axis_data[axis].angular_damping = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_DAMPING, axis_data[axis].angular_damping);
+		}
+
+	} else if ("erp" == var_name) {
+		axis_data[axis].erp = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_ERP, axis_data[axis].erp);
+		}
+
+	} else if ("angular_spring_enabled" == var_name) {
+		axis_data[axis].angular_spring_enabled = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_flag(j, axis, PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_SPRING, axis_data[axis].angular_spring_enabled);
+		}
+
+	} else if ("angular_spring_stiffness" == var_name) {
+		axis_data[axis].angular_spring_stiffness = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_STIFFNESS, axis_data[axis].angular_spring_stiffness);
+		}
+
+	} else if ("angular_spring_damping" == var_name) {
+		axis_data[axis].angular_spring_damping = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_DAMPING, axis_data[axis].angular_spring_damping);
+		}
+
+	} else if ("angular_equilibrium_point" == var_name) {
+		axis_data[axis].angular_equilibrium_point = p_value;
+		if (j.is_valid()) {
+			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_EQUILIBRIUM_POINT, axis_data[axis].angular_equilibrium_point);
+		}
+
+	} else {
+		return false;
+	}
+
+	return true;
+}
+
+bool PhysicalBone::SixDOFJointData::_get(const StringName &p_name, Variant &r_ret) const {
+	if (JointData::_get(p_name, r_ret)) {
+		return true;
+	}
+
+	String path = p_name;
+
+	if (!path.begins_with("joint_constraints/")) {
+		return false;
+	}
+
+	int axis;
+	{
+		const String axis_s = path.get_slicec('/', 1);
+		if ("x" == axis_s) {
+			axis = 0;
+		} else if ("y" == axis_s) {
+			axis = 1;
+		} else if ("z" == axis_s) {
+			axis = 2;
+		} else {
+			return false;
+		}
+	}
+
+	String var_name = path.get_slicec('/', 2);
+
+	if ("linear_limit_enabled" == var_name) {
+		r_ret = axis_data[axis].linear_limit_enabled;
+	} else if ("linear_limit_upper" == var_name) {
+		r_ret = axis_data[axis].linear_limit_upper;
+	} else if ("linear_limit_lower" == var_name) {
+		r_ret = axis_data[axis].linear_limit_lower;
+	} else if ("linear_limit_softness" == var_name) {
+		r_ret = axis_data[axis].linear_limit_softness;
+	} else if ("linear_spring_enabled" == var_name) {
+		r_ret = axis_data[axis].linear_spring_enabled;
+	} else if ("linear_spring_stiffness" == var_name) {
+		r_ret = axis_data[axis].linear_spring_stiffness;
+	} else if ("linear_spring_damping" == var_name) {
+		r_ret = axis_data[axis].linear_spring_damping;
+	} else if ("linear_equilibrium_point" == var_name) {
+		r_ret = axis_data[axis].linear_equilibrium_point;
+	} else if ("linear_restitution" == var_name) {
+		r_ret = axis_data[axis].linear_restitution;
+	} else if ("linear_damping" == var_name) {
+		r_ret = axis_data[axis].linear_damping;
+	} else if ("angular_limit_enabled" == var_name) {
+		r_ret = axis_data[axis].angular_limit_enabled;
+	} else if ("angular_limit_upper" == var_name) {
+		r_ret = Math::rad2deg(axis_data[axis].angular_limit_upper);
+	} else if ("angular_limit_lower" == var_name) {
+		r_ret = Math::rad2deg(axis_data[axis].angular_limit_lower);
+	} else if ("angular_limit_softness" == var_name) {
+		r_ret = axis_data[axis].angular_limit_softness;
+	} else if ("angular_restitution" == var_name) {
+		r_ret = axis_data[axis].angular_restitution;
+	} else if ("angular_damping" == var_name) {
+		r_ret = axis_data[axis].angular_damping;
+	} else if ("erp" == var_name) {
+		r_ret = axis_data[axis].erp;
+	} else if ("angular_spring_enabled" == var_name) {
+		r_ret = axis_data[axis].angular_spring_enabled;
+	} else if ("angular_spring_stiffness" == var_name) {
+		r_ret = axis_data[axis].angular_spring_stiffness;
+	} else if ("angular_spring_damping" == var_name) {
+		r_ret = axis_data[axis].angular_spring_damping;
+	} else if ("angular_equilibrium_point" == var_name) {
+		r_ret = axis_data[axis].angular_equilibrium_point;
+	} else {
+		return false;
+	}
+
+	return true;
+}
+
+void PhysicalBone::SixDOFJointData::_get_property_list(List<PropertyInfo> *p_list) const {
+	const StringName axis_names[] = { "x", "y", "z" };
+	for (int i = 0; i < 3; ++i) {
+		p_list->push_back(PropertyInfo(Variant::BOOL, "joint_constraints/" + axis_names[i] + "/linear_limit_enabled"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/linear_limit_upper"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/linear_limit_lower"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/linear_limit_softness", PROPERTY_HINT_RANGE, "0.01,16,0.01"));
+		p_list->push_back(PropertyInfo(Variant::BOOL, "joint_constraints/" + axis_names[i] + "/linear_spring_enabled"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/linear_spring_stiffness"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/linear_spring_damping"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/linear_equilibrium_point"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/linear_restitution", PROPERTY_HINT_RANGE, "0.01,16,0.01"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/linear_damping", PROPERTY_HINT_RANGE, "0.01,16,0.01"));
+		p_list->push_back(PropertyInfo(Variant::BOOL, "joint_constraints/" + axis_names[i] + "/angular_limit_enabled"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/angular_limit_upper", PROPERTY_HINT_RANGE, "-180,180,0.01"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/angular_limit_lower", PROPERTY_HINT_RANGE, "-180,180,0.01"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/angular_limit_softness", PROPERTY_HINT_RANGE, "0.01,16,0.01"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/angular_restitution", PROPERTY_HINT_RANGE, "0.01,16,0.01"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/angular_damping", PROPERTY_HINT_RANGE, "0.01,16,0.01"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/erp"));
+		p_list->push_back(PropertyInfo(Variant::BOOL, "joint_constraints/" + axis_names[i] + "/angular_spring_enabled"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/angular_spring_stiffness"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/angular_spring_damping"));
+		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/angular_equilibrium_point"));
+	}
+}
+
+bool PhysicalBone::_set(const StringName &p_name, const Variant &p_value) {
+	if (p_name == "bone_name") {
+		set_bone_name(p_value);
+		return true;
+	}
+
+	if (joint_data) {
+		if (joint_data->_set(p_name, p_value, joint)) {
+#ifdef TOOLS_ENABLED
+			update_gizmos();
+#endif
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool PhysicalBone::_get(const StringName &p_name, Variant &r_ret) const {
+	if (p_name == "bone_name") {
+		r_ret = get_bone_name();
+		return true;
+	}
+
+	if (joint_data) {
+		return joint_data->_get(p_name, r_ret);
+	}
+
+	return false;
+}
+
+void PhysicalBone::_get_property_list(List<PropertyInfo> *p_list) const {
+	Skeleton *parent = find_skeleton_parent(get_parent());
+
+	if (parent) {
+		String names;
+		for (int i = 0; i < parent->get_bone_count(); i++) {
+			if (i > 0) {
+				names += ",";
+			}
+			names += parent->get_bone_name(i);
+		}
+
+		p_list->push_back(PropertyInfo(Variant::STRING_NAME, "bone_name", PROPERTY_HINT_ENUM, names));
+	} else {
+		p_list->push_back(PropertyInfo(Variant::STRING_NAME, "bone_name"));
+	}
+
+	if (joint_data) {
+		joint_data->_get_property_list(p_list);
+	}
+}
+
+void PhysicalBone::_notification(int p_what) {
+	switch (p_what) {
+		case NOTIFICATION_ENTER_TREE:
+			parent_skeleton = find_skeleton_parent(get_parent());
+			update_bone_id();
+			reset_to_rest_position();
+			reset_physics_simulation_state();
+			if (!joint.is_valid() && joint_data) {
+				_reload_joint();
+			}
+			break;
+		case NOTIFICATION_EXIT_TREE:
+			if (parent_skeleton) {
+				if (-1 != bone_id) {
+					parent_skeleton->unbind_physical_bone_from_bone(bone_id);
+					bone_id = -1;
+				}
+			}
+			parent_skeleton = nullptr;
+			if (joint.is_valid()) {
+				PhysicsServer::get_singleton()->free(joint);
+				joint = RID();
+			}
+			break;
+		case NOTIFICATION_TRANSFORM_CHANGED:
+			if (Engine::get_singleton()->is_editor_hint()) {
+				update_offset();
+			}
+			break;
+	}
+}
+
+void PhysicalBone::_direct_state_changed(Object *p_state) {
+	if (!simulate_physics || !_internal_simulate_physics) {
+		return;
+	}
+
+	/// Update bone transform
+
+	PhysicsDirectBodyState *state = Object::cast_to<PhysicsDirectBodyState>(p_state);
+	ERR_FAIL_COND_MSG(!state, "Method '_direct_state_changed' must receive a valid PhysicsDirectBodyState object as argument");
+
+	Transform global_transform(state->get_transform());
+
+	set_ignore_transform_notification(true);
+	set_global_transform(global_transform);
+	set_ignore_transform_notification(false);
+	_on_transform_changed();
+
+	// Update skeleton
+	if (parent_skeleton) {
+		if (-1 != bone_id) {
+			parent_skeleton->set_bone_global_pose_override(bone_id, parent_skeleton->get_global_transform().affine_inverse() * (global_transform * body_offset_inverse), 1.0, true);
+		}
+	}
+}
+
+void PhysicalBone::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("apply_central_impulse", "impulse"), &PhysicalBone::apply_central_impulse);
+	ClassDB::bind_method(D_METHOD("apply_impulse", "position", "impulse"), &PhysicalBone::apply_impulse);
+
+	ClassDB::bind_method(D_METHOD("_direct_state_changed"), &PhysicalBone::_direct_state_changed);
+
+	ClassDB::bind_method(D_METHOD("set_joint_type", "joint_type"), &PhysicalBone::set_joint_type);
+	ClassDB::bind_method(D_METHOD("get_joint_type"), &PhysicalBone::get_joint_type);
+
+	ClassDB::bind_method(D_METHOD("set_joint_offset", "offset"), &PhysicalBone::set_joint_offset);
+	ClassDB::bind_method(D_METHOD("get_joint_offset"), &PhysicalBone::get_joint_offset);
+
+	ClassDB::bind_method(D_METHOD("set_body_offset", "offset"), &PhysicalBone::set_body_offset);
+	ClassDB::bind_method(D_METHOD("get_body_offset"), &PhysicalBone::get_body_offset);
+
+	ClassDB::bind_method(D_METHOD("get_simulate_physics"), &PhysicalBone::get_simulate_physics);
+
+	ClassDB::bind_method(D_METHOD("is_simulating_physics"), &PhysicalBone::is_simulating_physics);
+
+	ClassDB::bind_method(D_METHOD("get_bone_id"), &PhysicalBone::get_bone_id);
+
+	ClassDB::bind_method(D_METHOD("set_mass", "mass"), &PhysicalBone::set_mass);
+	ClassDB::bind_method(D_METHOD("get_mass"), &PhysicalBone::get_mass);
+
+	ClassDB::bind_method(D_METHOD("set_weight", "weight"), &PhysicalBone::set_weight);
+	ClassDB::bind_method(D_METHOD("get_weight"), &PhysicalBone::get_weight);
+
+	ClassDB::bind_method(D_METHOD("set_friction", "friction"), &PhysicalBone::set_friction);
+	ClassDB::bind_method(D_METHOD("get_friction"), &PhysicalBone::get_friction);
+
+	ClassDB::bind_method(D_METHOD("set_bounce", "bounce"), &PhysicalBone::set_bounce);
+	ClassDB::bind_method(D_METHOD("get_bounce"), &PhysicalBone::get_bounce);
+
+	ClassDB::bind_method(D_METHOD("set_gravity_scale", "gravity_scale"), &PhysicalBone::set_gravity_scale);
+	ClassDB::bind_method(D_METHOD("get_gravity_scale"), &PhysicalBone::get_gravity_scale);
+
+	ADD_GROUP("Joint", "joint_");
+	ADD_PROPERTY(PropertyInfo(Variant::INT, "joint_type", PROPERTY_HINT_ENUM, "None,PinJoint,ConeJoint,HingeJoint,SliderJoint,6DOFJoint"), "set_joint_type", "get_joint_type");
+	ADD_PROPERTY(PropertyInfo(Variant::TRANSFORM, "joint_offset"), "set_joint_offset", "get_joint_offset");
+
+	ADD_PROPERTY(PropertyInfo(Variant::TRANSFORM, "body_offset"), "set_body_offset", "get_body_offset");
+
+	ADD_PROPERTY(PropertyInfo(Variant::REAL, "mass", PROPERTY_HINT_EXP_RANGE, "0.01,65535,0.01"), "set_mass", "get_mass");
+	ADD_PROPERTY(PropertyInfo(Variant::REAL, "weight", PROPERTY_HINT_EXP_RANGE, "0.01,65535,0.01"), "set_weight", "get_weight");
+	ADD_PROPERTY(PropertyInfo(Variant::REAL, "friction", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_friction", "get_friction");
+	ADD_PROPERTY(PropertyInfo(Variant::REAL, "bounce", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_bounce", "get_bounce");
+	ADD_PROPERTY(PropertyInfo(Variant::REAL, "gravity_scale", PROPERTY_HINT_RANGE, "-10,10,0.01"), "set_gravity_scale", "get_gravity_scale");
+
+	BIND_ENUM_CONSTANT(JOINT_TYPE_NONE);
+	BIND_ENUM_CONSTANT(JOINT_TYPE_PIN);
+	BIND_ENUM_CONSTANT(JOINT_TYPE_CONE);
+	BIND_ENUM_CONSTANT(JOINT_TYPE_HINGE);
+	BIND_ENUM_CONSTANT(JOINT_TYPE_SLIDER);
+	BIND_ENUM_CONSTANT(JOINT_TYPE_6DOF);
+}
+
+Skeleton *PhysicalBone::find_skeleton_parent(Node *p_parent) {
+	if (!p_parent) {
+		return nullptr;
+	}
+	Skeleton *s = Object::cast_to<Skeleton>(p_parent);
+	return s ? s : find_skeleton_parent(p_parent->get_parent());
+}
+
+void PhysicalBone::_fix_joint_offset() {
+	// Clamp joint origin to bone origin
+	if (parent_skeleton) {
+		joint_offset.origin = body_offset.affine_inverse().origin;
+	}
+}
+
+void PhysicalBone::_reload_joint() {
+	if (joint.is_valid()) {
+		PhysicsServer::get_singleton()->free(joint);
+		joint = RID();
+	}
+
+	if (!parent_skeleton) {
+		return;
+	}
+
+	PhysicalBone *body_a = parent_skeleton->get_physical_bone_parent(bone_id);
+	if (!body_a) {
+		return;
+	}
+
+	Transform joint_transf = get_global_transform() * joint_offset;
+	Transform local_a = body_a->get_global_transform().affine_inverse() * joint_transf;
+	local_a.orthonormalize();
+
+	switch (get_joint_type()) {
+		case JOINT_TYPE_PIN: {
+			joint = RID_PRIME(PhysicsServer::get_singleton()->joint_create_pin(body_a->get_rid(), local_a.origin, get_rid(), joint_offset.origin));
+			const PinJointData *pjd(static_cast<const PinJointData *>(joint_data));
+			PhysicsServer::get_singleton()->pin_joint_set_param(joint, PhysicsServer::PIN_JOINT_BIAS, pjd->bias);
+			PhysicsServer::get_singleton()->pin_joint_set_param(joint, PhysicsServer::PIN_JOINT_DAMPING, pjd->damping);
+			PhysicsServer::get_singleton()->pin_joint_set_param(joint, PhysicsServer::PIN_JOINT_IMPULSE_CLAMP, pjd->impulse_clamp);
+
+		} break;
+		case JOINT_TYPE_CONE: {
+			joint = RID_PRIME(PhysicsServer::get_singleton()->joint_create_cone_twist(body_a->get_rid(), local_a, get_rid(), joint_offset));
+			const ConeJointData *cjd(static_cast<const ConeJointData *>(joint_data));
+			PhysicsServer::get_singleton()->cone_twist_joint_set_param(joint, PhysicsServer::CONE_TWIST_JOINT_SWING_SPAN, cjd->swing_span);
+			PhysicsServer::get_singleton()->cone_twist_joint_set_param(joint, PhysicsServer::CONE_TWIST_JOINT_TWIST_SPAN, cjd->twist_span);
+			PhysicsServer::get_singleton()->cone_twist_joint_set_param(joint, PhysicsServer::CONE_TWIST_JOINT_BIAS, cjd->bias);
+			PhysicsServer::get_singleton()->cone_twist_joint_set_param(joint, PhysicsServer::CONE_TWIST_JOINT_SOFTNESS, cjd->softness);
+			PhysicsServer::get_singleton()->cone_twist_joint_set_param(joint, PhysicsServer::CONE_TWIST_JOINT_RELAXATION, cjd->relaxation);
+
+		} break;
+		case JOINT_TYPE_HINGE: {
+			joint = RID_PRIME(PhysicsServer::get_singleton()->joint_create_hinge(body_a->get_rid(), local_a, get_rid(), joint_offset));
+			const HingeJointData *hjd(static_cast<const HingeJointData *>(joint_data));
+			PhysicsServer::get_singleton()->hinge_joint_set_flag(joint, PhysicsServer::HINGE_JOINT_FLAG_USE_LIMIT, hjd->angular_limit_enabled);
+			PhysicsServer::get_singleton()->hinge_joint_set_param(joint, PhysicsServer::HINGE_JOINT_LIMIT_UPPER, hjd->angular_limit_upper);
+			PhysicsServer::get_singleton()->hinge_joint_set_param(joint, PhysicsServer::HINGE_JOINT_LIMIT_LOWER, hjd->angular_limit_lower);
+			PhysicsServer::get_singleton()->hinge_joint_set_param(joint, PhysicsServer::HINGE_JOINT_LIMIT_BIAS, hjd->angular_limit_bias);
+			PhysicsServer::get_singleton()->hinge_joint_set_param(joint, PhysicsServer::HINGE_JOINT_LIMIT_SOFTNESS, hjd->angular_limit_softness);
+			PhysicsServer::get_singleton()->hinge_joint_set_param(joint, PhysicsServer::HINGE_JOINT_LIMIT_RELAXATION, hjd->angular_limit_relaxation);
+
+		} break;
+		case JOINT_TYPE_SLIDER: {
+			joint = RID_PRIME(PhysicsServer::get_singleton()->joint_create_slider(body_a->get_rid(), local_a, get_rid(), joint_offset));
+			const SliderJointData *sjd(static_cast<const SliderJointData *>(joint_data));
+			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_UPPER, sjd->linear_limit_upper);
+			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_LOWER, sjd->linear_limit_lower);
+			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_SOFTNESS, sjd->linear_limit_softness);
+			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_RESTITUTION, sjd->linear_limit_restitution);
+			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_DAMPING, sjd->linear_limit_restitution);
+			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_UPPER, sjd->angular_limit_upper);
+			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_LOWER, sjd->angular_limit_lower);
+			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_SOFTNESS, sjd->angular_limit_softness);
+			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_SOFTNESS, sjd->angular_limit_softness);
+			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_DAMPING, sjd->angular_limit_damping);
+
+		} break;
+		case JOINT_TYPE_6DOF: {
+			joint = RID_PRIME(PhysicsServer::get_singleton()->joint_create_generic_6dof(body_a->get_rid(), local_a, get_rid(), joint_offset));
+			const SixDOFJointData *g6dofjd(static_cast<const SixDOFJointData *>(joint_data));
+			for (int axis = 0; axis < 3; ++axis) {
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_flag(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_LIMIT, g6dofjd->axis_data[axis].linear_limit_enabled);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_LINEAR_UPPER_LIMIT, g6dofjd->axis_data[axis].linear_limit_upper);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_LINEAR_LOWER_LIMIT, g6dofjd->axis_data[axis].linear_limit_lower);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_LINEAR_LIMIT_SOFTNESS, g6dofjd->axis_data[axis].linear_limit_softness);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_flag(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_SPRING, g6dofjd->axis_data[axis].linear_spring_enabled);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_STIFFNESS, g6dofjd->axis_data[axis].linear_spring_stiffness);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_DAMPING, g6dofjd->axis_data[axis].linear_spring_damping);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_EQUILIBRIUM_POINT, g6dofjd->axis_data[axis].linear_equilibrium_point);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_LINEAR_RESTITUTION, g6dofjd->axis_data[axis].linear_restitution);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_LINEAR_DAMPING, g6dofjd->axis_data[axis].linear_damping);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_flag(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_LIMIT, g6dofjd->axis_data[axis].angular_limit_enabled);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_UPPER_LIMIT, g6dofjd->axis_data[axis].angular_limit_upper);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_LOWER_LIMIT, g6dofjd->axis_data[axis].angular_limit_lower);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_LIMIT_SOFTNESS, g6dofjd->axis_data[axis].angular_limit_softness);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_RESTITUTION, g6dofjd->axis_data[axis].angular_restitution);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_DAMPING, g6dofjd->axis_data[axis].angular_damping);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_ERP, g6dofjd->axis_data[axis].erp);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_flag(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_SPRING, g6dofjd->axis_data[axis].angular_spring_enabled);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_STIFFNESS, g6dofjd->axis_data[axis].angular_spring_stiffness);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_DAMPING, g6dofjd->axis_data[axis].angular_spring_damping);
+				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_EQUILIBRIUM_POINT, g6dofjd->axis_data[axis].angular_equilibrium_point);
+			}
+
+		} break;
+		case JOINT_TYPE_NONE: {
+		} break;
+	}
+}
+
+void PhysicalBone::_on_bone_parent_changed() {
+	_reload_joint();
+}
+
+void PhysicalBone::_set_gizmo_move_joint(bool p_move_joint) {
+#ifdef TOOLS_ENABLED
+	gizmo_move_joint = p_move_joint;
+	SpatialEditor::get_singleton()->update_transform_gizmo();
+#endif
+}
+
+#ifdef TOOLS_ENABLED
+Transform PhysicalBone::get_global_gizmo_transform() const {
+	return gizmo_move_joint ? get_global_transform() * joint_offset : get_global_transform();
+}
+
+Transform PhysicalBone::get_local_gizmo_transform() const {
+	return gizmo_move_joint ? get_transform() * joint_offset : get_transform();
+}
+#endif
+
+const PhysicalBone::JointData *PhysicalBone::get_joint_data() const {
+	return joint_data;
+}
+
+Skeleton *PhysicalBone::find_skeleton_parent() {
+	return find_skeleton_parent(this);
+}
+
+void PhysicalBone::set_joint_type(JointType p_joint_type) {
+	if (p_joint_type == get_joint_type()) {
+		return;
+	}
+
+	if (joint_data) {
+		memdelete(joint_data);
+	}
+	joint_data = nullptr;
+	switch (p_joint_type) {
+		case JOINT_TYPE_PIN:
+			joint_data = memnew(PinJointData);
+			break;
+		case JOINT_TYPE_CONE:
+			joint_data = memnew(ConeJointData);
+			break;
+		case JOINT_TYPE_HINGE:
+			joint_data = memnew(HingeJointData);
+			break;
+		case JOINT_TYPE_SLIDER:
+			joint_data = memnew(SliderJointData);
+			break;
+		case JOINT_TYPE_6DOF:
+			joint_data = memnew(SixDOFJointData);
+			break;
+		case JOINT_TYPE_NONE:
+			break;
+	}
+
+	_reload_joint();
+
+#ifdef TOOLS_ENABLED
+	_change_notify();
+	update_gizmos();
+#endif
+}
+
+PhysicalBone::JointType PhysicalBone::get_joint_type() const {
+	return joint_data ? joint_data->get_joint_type() : JOINT_TYPE_NONE;
+}
+
+void PhysicalBone::set_joint_offset(const Transform &p_offset) {
+	joint_offset = p_offset;
+
+	_fix_joint_offset();
+
+	set_ignore_transform_notification(true);
+	reset_to_rest_position();
+	set_ignore_transform_notification(false);
+
+#ifdef TOOLS_ENABLED
+	update_gizmos();
+#endif
+}
+
+const Transform &PhysicalBone::get_body_offset() const {
+	return body_offset;
+}
+
+void PhysicalBone::set_body_offset(const Transform &p_offset) {
+	body_offset = p_offset;
+	body_offset_inverse = body_offset.affine_inverse();
+
+	_fix_joint_offset();
+
+	set_ignore_transform_notification(true);
+	reset_to_rest_position();
+	set_ignore_transform_notification(false);
+
+#ifdef TOOLS_ENABLED
+	update_gizmos();
+#endif
+}
+
+const Transform &PhysicalBone::get_joint_offset() const {
+	return joint_offset;
+}
+
+void PhysicalBone::set_simulate_physics(bool p_simulate) {
+	if (simulate_physics == p_simulate) {
+		return;
+	}
+
+	simulate_physics = p_simulate;
+	reset_physics_simulation_state();
+}
+
+bool PhysicalBone::get_simulate_physics() {
+	return simulate_physics;
+}
+
+bool PhysicalBone::is_simulating_physics() {
+	return _internal_simulate_physics;
+}
+
+void PhysicalBone::set_bone_name(const String &p_name) {
+	bone_name = p_name;
+	bone_id = -1;
+
+	update_bone_id();
+	reset_to_rest_position();
+}
+
+const String &PhysicalBone::get_bone_name() const {
+	return bone_name;
+}
+
+void PhysicalBone::set_mass(real_t p_mass) {
+	ERR_FAIL_COND(p_mass <= 0);
+	mass = p_mass;
+	PhysicsServer::get_singleton()->body_set_param(get_rid(), PhysicsServer::BODY_PARAM_MASS, mass);
+}
+
+real_t PhysicalBone::get_mass() const {
+	return mass;
+}
+
+void PhysicalBone::set_weight(real_t p_weight) {
+	set_mass(p_weight / real_t(GLOBAL_DEF("physics/3d/default_gravity", 9.8)));
+}
+
+real_t PhysicalBone::get_weight() const {
+	return mass * real_t(GLOBAL_DEF("physics/3d/default_gravity", 9.8));
+}
+
+void PhysicalBone::set_friction(real_t p_friction) {
+	ERR_FAIL_COND(p_friction < 0 || p_friction > 1);
+
+	friction = p_friction;
+	PhysicsServer::get_singleton()->body_set_param(get_rid(), PhysicsServer::BODY_PARAM_FRICTION, friction);
+}
+
+real_t PhysicalBone::get_friction() const {
+	return friction;
+}
+
+void PhysicalBone::set_bounce(real_t p_bounce) {
+	ERR_FAIL_COND(p_bounce < 0 || p_bounce > 1);
+
+	bounce = p_bounce;
+	PhysicsServer::get_singleton()->body_set_param(get_rid(), PhysicsServer::BODY_PARAM_BOUNCE, bounce);
+}
+
+real_t PhysicalBone::get_bounce() const {
+	return bounce;
+}
+
+void PhysicalBone::set_gravity_scale(real_t p_gravity_scale) {
+	gravity_scale = p_gravity_scale;
+	PhysicsServer::get_singleton()->body_set_param(get_rid(), PhysicsServer::BODY_PARAM_GRAVITY_SCALE, gravity_scale);
+}
+
+real_t PhysicalBone::get_gravity_scale() const {
+	return gravity_scale;
+}
+
+PhysicalBone::PhysicalBone() :
+		PhysicsBody(PhysicsServer::BODY_MODE_STATIC),
+#ifdef TOOLS_ENABLED
+		gizmo_move_joint(false),
+#endif
+		joint_data(nullptr),
+		parent_skeleton(nullptr),
+		simulate_physics(false),
+		_internal_simulate_physics(false),
+		bone_id(-1),
+		bone_name(""),
+		bounce(0),
+		mass(1),
+		friction(1),
+		gravity_scale(1) {
+
+	reset_physics_simulation_state();
+}
+
+PhysicalBone::~PhysicalBone() {
+	if (joint_data) {
+		memdelete(joint_data);
+	}
+}
+
+void PhysicalBone::update_bone_id() {
+	if (!parent_skeleton) {
+		return;
+	}
+
+	const int new_bone_id = parent_skeleton->find_bone(bone_name);
+
+	if (new_bone_id != bone_id) {
+		if (-1 != bone_id) {
+			// Assert the unbind from old node
+			parent_skeleton->unbind_physical_bone_from_bone(bone_id);
+		}
+
+		bone_id = new_bone_id;
+
+		parent_skeleton->bind_physical_bone_to_bone(bone_id, this);
+
+		_fix_joint_offset();
+		reset_physics_simulation_state();
+	}
+}
+
+void PhysicalBone::update_offset() {
+#ifdef TOOLS_ENABLED
+	if (parent_skeleton) {
+		Transform bone_transform(parent_skeleton->get_global_transform());
+		if (-1 != bone_id) {
+			bone_transform *= parent_skeleton->get_bone_global_pose(bone_id);
+		}
+
+		if (gizmo_move_joint) {
+			bone_transform *= body_offset;
+			set_joint_offset(bone_transform.affine_inverse() * get_global_transform());
+		} else {
+			set_body_offset(bone_transform.affine_inverse() * get_global_transform());
+		}
+	}
+#endif
+}
+
+void PhysicalBone::_start_physics_simulation() {
+	if (_internal_simulate_physics || !parent_skeleton) {
+		return;
+	}
+	reset_to_rest_position();
+	PhysicsServer::get_singleton()->body_set_mode(get_rid(), PhysicsServer::BODY_MODE_RIGID);
+	PhysicsServer::get_singleton()->body_set_collision_layer(get_rid(), get_collision_layer());
+	PhysicsServer::get_singleton()->body_set_collision_mask(get_rid(), get_collision_mask());
+	PhysicsServer::get_singleton()->body_set_force_integration_callback(get_rid(), this, "_direct_state_changed");
+	set_as_toplevel(true);
+	_internal_simulate_physics = true;
+}
+
+void PhysicalBone::_stop_physics_simulation() {
+	if (!parent_skeleton) {
+		return;
+	}
+
+	if (parent_skeleton->get_animate_physical_bones()) {
+		PhysicsServer::get_singleton()->body_set_mode(get_rid(), PhysicsServer::BODY_MODE_KINEMATIC);
+		PhysicsServer::get_singleton()->body_set_collision_layer(get_rid(), get_collision_layer());
+		PhysicsServer::get_singleton()->body_set_collision_mask(get_rid(), get_collision_mask());
+	} else {
+		PhysicsServer::get_singleton()->body_set_mode(get_rid(), PhysicsServer::BODY_MODE_STATIC);
+		PhysicsServer::get_singleton()->body_set_collision_layer(get_rid(), 0);
+		PhysicsServer::get_singleton()->body_set_collision_mask(get_rid(), 0);
+	}
+	if (_internal_simulate_physics) {
+		PhysicsServer::get_singleton()->body_set_force_integration_callback(get_rid(), NULL, "");
+		parent_skeleton->set_bone_global_pose_override(bone_id, Transform(), 0.0, false);
+		set_as_toplevel(false);
+		_internal_simulate_physics = false;
+	}
+}
diff --git a/modules/skeleton_3d/nodes/physical_bone.h b/modules/skeleton_3d/nodes/physical_bone.h
new file mode 100644
index 000000000..9c6755faa
--- /dev/null
+++ b/modules/skeleton_3d/nodes/physical_bone.h
@@ -0,0 +1,321 @@
+#ifndef PHYSICAL_BONE_H
+#define PHYSICAL_BONE_H
+
+/*************************************************************************/
+/*  physics_body.h                                                       */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                      https://godotengine.org                          */
+/*************************************************************************/
+/* Copyright (c) 2007-2022 Juan Linietsky, Ariel Manzur.                 */
+/* Copyright (c) 2014-2022 Godot Engine contributors (cf. AUTHORS.md).   */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "core/object/reference.h"
+#include "core/containers/vset.h"
+#include "scene/3d/collision_object.h"
+#include "servers/physics_server.h"
+#include "scene/3d/physics_body.h"
+
+class PhysicsMaterial;
+class Skeleton;
+
+class PhysicalBone : public PhysicsBody {
+	GDCLASS(PhysicalBone, PhysicsBody);
+
+public:
+	enum JointType {
+		JOINT_TYPE_NONE,
+		JOINT_TYPE_PIN,
+		JOINT_TYPE_CONE,
+		JOINT_TYPE_HINGE,
+		JOINT_TYPE_SLIDER,
+		JOINT_TYPE_6DOF
+	};
+
+	struct JointData {
+		virtual JointType get_joint_type() { return JOINT_TYPE_NONE; }
+
+		/// "j" is used to set the parameter inside the PhysicsServer
+		virtual bool _set(const StringName &p_name, const Variant &p_value, RID j);
+		virtual bool _get(const StringName &p_name, Variant &r_ret) const;
+		virtual void _get_property_list(List<PropertyInfo> *p_list) const;
+
+		virtual ~JointData() {}
+	};
+
+	struct PinJointData : public JointData {
+		virtual JointType get_joint_type() { return JOINT_TYPE_PIN; }
+
+		virtual bool _set(const StringName &p_name, const Variant &p_value, RID j);
+		virtual bool _get(const StringName &p_name, Variant &r_ret) const;
+		virtual void _get_property_list(List<PropertyInfo> *p_list) const;
+
+		real_t bias;
+		real_t damping;
+		real_t impulse_clamp;
+
+		PinJointData() :
+				bias(0.3),
+				damping(1.),
+				impulse_clamp(0) {}
+	};
+
+	struct ConeJointData : public JointData {
+		virtual JointType get_joint_type() { return JOINT_TYPE_CONE; }
+
+		virtual bool _set(const StringName &p_name, const Variant &p_value, RID j);
+		virtual bool _get(const StringName &p_name, Variant &r_ret) const;
+		virtual void _get_property_list(List<PropertyInfo> *p_list) const;
+
+		real_t swing_span;
+		real_t twist_span;
+		real_t bias;
+		real_t softness;
+		real_t relaxation;
+
+		ConeJointData() :
+				swing_span(Math_PI * 0.25),
+				twist_span(Math_PI),
+				bias(0.3),
+				softness(0.8),
+				relaxation(1.) {}
+	};
+
+	struct HingeJointData : public JointData {
+		virtual JointType get_joint_type() { return JOINT_TYPE_HINGE; }
+
+		virtual bool _set(const StringName &p_name, const Variant &p_value, RID j);
+		virtual bool _get(const StringName &p_name, Variant &r_ret) const;
+		virtual void _get_property_list(List<PropertyInfo> *p_list) const;
+
+		bool angular_limit_enabled;
+		real_t angular_limit_upper;
+		real_t angular_limit_lower;
+		real_t angular_limit_bias;
+		real_t angular_limit_softness;
+		real_t angular_limit_relaxation;
+
+		HingeJointData() :
+				angular_limit_enabled(false),
+				angular_limit_upper(Math_PI * 0.5),
+				angular_limit_lower(-Math_PI * 0.5),
+				angular_limit_bias(0.3),
+				angular_limit_softness(0.9),
+				angular_limit_relaxation(1.) {}
+	};
+
+	struct SliderJointData : public JointData {
+		virtual JointType get_joint_type() { return JOINT_TYPE_SLIDER; }
+
+		virtual bool _set(const StringName &p_name, const Variant &p_value, RID j);
+		virtual bool _get(const StringName &p_name, Variant &r_ret) const;
+		virtual void _get_property_list(List<PropertyInfo> *p_list) const;
+
+		real_t linear_limit_upper;
+		real_t linear_limit_lower;
+		real_t linear_limit_softness;
+		real_t linear_limit_restitution;
+		real_t linear_limit_damping;
+		real_t angular_limit_upper;
+		real_t angular_limit_lower;
+		real_t angular_limit_softness;
+		real_t angular_limit_restitution;
+		real_t angular_limit_damping;
+
+		SliderJointData() :
+				linear_limit_upper(1.),
+				linear_limit_lower(-1.),
+				linear_limit_softness(1.),
+				linear_limit_restitution(0.7),
+				linear_limit_damping(1.),
+				angular_limit_upper(0),
+				angular_limit_lower(0),
+				angular_limit_softness(1.),
+				angular_limit_restitution(0.7),
+				angular_limit_damping(1.) {}
+	};
+
+	struct SixDOFJointData : public JointData {
+		struct SixDOFAxisData {
+			bool linear_limit_enabled;
+			real_t linear_limit_upper;
+			real_t linear_limit_lower;
+			real_t linear_limit_softness;
+			real_t linear_restitution;
+			real_t linear_damping;
+			bool linear_spring_enabled;
+			real_t linear_spring_stiffness;
+			real_t linear_spring_damping;
+			real_t linear_equilibrium_point;
+			bool angular_limit_enabled;
+			real_t angular_limit_upper;
+			real_t angular_limit_lower;
+			real_t angular_limit_softness;
+			real_t angular_restitution;
+			real_t angular_damping;
+			real_t erp;
+			bool angular_spring_enabled;
+			real_t angular_spring_stiffness;
+			real_t angular_spring_damping;
+			real_t angular_equilibrium_point;
+
+			SixDOFAxisData() :
+					linear_limit_enabled(true),
+					linear_limit_upper(0),
+					linear_limit_lower(0),
+					linear_limit_softness(0.7),
+					linear_restitution(0.5),
+					linear_damping(1.),
+					linear_spring_enabled(false),
+					linear_spring_stiffness(0),
+					linear_spring_damping(0),
+					linear_equilibrium_point(0),
+					angular_limit_enabled(true),
+					angular_limit_upper(0),
+					angular_limit_lower(0),
+					angular_limit_softness(0.5),
+					angular_restitution(0),
+					angular_damping(1.),
+					erp(0.5),
+					angular_spring_enabled(false),
+					angular_spring_stiffness(0),
+					angular_spring_damping(0.),
+					angular_equilibrium_point(0) {}
+		};
+
+		virtual JointType get_joint_type() { return JOINT_TYPE_6DOF; }
+
+		virtual bool _set(const StringName &p_name, const Variant &p_value, RID j);
+		virtual bool _get(const StringName &p_name, Variant &r_ret) const;
+		virtual void _get_property_list(List<PropertyInfo> *p_list) const;
+
+		SixDOFAxisData axis_data[3];
+
+		SixDOFJointData() {}
+	};
+
+private:
+#ifdef TOOLS_ENABLED
+	// if false gizmo move body
+	bool gizmo_move_joint;
+#endif
+
+	JointData *joint_data;
+	Transform joint_offset;
+	RID joint;
+
+	Skeleton *parent_skeleton;
+	Transform body_offset;
+	Transform body_offset_inverse;
+	bool simulate_physics;
+	bool _internal_simulate_physics;
+	int bone_id;
+
+	String bone_name;
+	real_t bounce;
+	real_t mass;
+	real_t friction;
+	real_t gravity_scale;
+
+protected:
+	bool _set(const StringName &p_name, const Variant &p_value);
+	bool _get(const StringName &p_name, Variant &r_ret) const;
+	void _get_property_list(List<PropertyInfo> *p_list) const;
+	void _notification(int p_what);
+	void _direct_state_changed(Object *p_state);
+
+	static void _bind_methods();
+
+private:
+	static Skeleton *find_skeleton_parent(Node *p_parent);
+
+	void _fix_joint_offset();
+	void _reload_joint();
+
+public:
+	void _on_bone_parent_changed();
+	void _set_gizmo_move_joint(bool p_move_joint);
+
+public:
+#ifdef TOOLS_ENABLED
+	virtual Transform get_global_gizmo_transform() const;
+	virtual Transform get_local_gizmo_transform() const;
+#endif
+
+	const JointData *get_joint_data() const;
+	Skeleton *find_skeleton_parent();
+
+	int get_bone_id() const { return bone_id; }
+
+	void set_joint_type(JointType p_joint_type);
+	JointType get_joint_type() const;
+
+	void set_joint_offset(const Transform &p_offset);
+	const Transform &get_joint_offset() const;
+
+	void set_body_offset(const Transform &p_offset);
+	const Transform &get_body_offset() const;
+
+	void set_simulate_physics(bool p_simulate);
+	bool get_simulate_physics();
+	bool is_simulating_physics();
+
+	void set_bone_name(const String &p_name);
+	const String &get_bone_name() const;
+
+	void set_mass(real_t p_mass);
+	real_t get_mass() const;
+
+	void set_weight(real_t p_weight);
+	real_t get_weight() const;
+
+	void set_friction(real_t p_friction);
+	real_t get_friction() const;
+
+	void set_bounce(real_t p_bounce);
+	real_t get_bounce() const;
+
+	void set_gravity_scale(real_t p_gravity_scale);
+	real_t get_gravity_scale() const;
+
+	void apply_central_impulse(const Vector3 &p_impulse);
+	void apply_impulse(const Vector3 &p_pos, const Vector3 &p_impulse);
+
+	void reset_physics_simulation_state();
+	void reset_to_rest_position();
+
+	PhysicalBone();
+	~PhysicalBone();
+
+private:
+	void update_bone_id();
+	void update_offset();
+
+	void _start_physics_simulation();
+	void _stop_physics_simulation();
+};
+
+VARIANT_ENUM_CAST(PhysicalBone::JointType);
+
+#endif // PHYSICS_BODY__H
diff --git a/scene/3d/skeleton.cpp b/modules/skeleton_3d/nodes/skeleton.cpp
similarity index 99%
rename from scene/3d/skeleton.cpp
rename to modules/skeleton_3d/nodes/skeleton.cpp
index f0e9281ff..7ab9ff0ca 100644
--- a/scene/3d/skeleton.cpp
+++ b/modules/skeleton_3d/nodes/skeleton.cpp
@@ -34,10 +34,10 @@
 
 #include "core/config/engine.h"
 #include "core/config/project_settings.h"
-#include "scene/3d/physics_body.h"
-#include "scene/resources/skeleton_modification_3d.h"
-#include "scene/resources/skeleton_modification_stack_3d.h"
-#include "scene/resources/skin.h"
+#include "physical_bone.h"
+#include "../resources/skeleton_modification_3d.h"
+#include "../resources/skeleton_modification_stack_3d.h"
+#include "../resources/skin.h"
 #include "scene/resources/surface_tool.h"
 #include "scene/scene_string_names.h"
 
diff --git a/scene/3d/skeleton.h b/modules/skeleton_3d/nodes/skeleton.h
similarity index 100%
rename from scene/3d/skeleton.h
rename to modules/skeleton_3d/nodes/skeleton.h
diff --git a/scene/animation/skeleton_ik.cpp b/modules/skeleton_3d/nodes/skeleton_ik.cpp
similarity index 99%
rename from scene/animation/skeleton_ik.cpp
rename to modules/skeleton_3d/nodes/skeleton_ik.cpp
index e4f2987dd..2c8f81202 100644
--- a/scene/animation/skeleton_ik.cpp
+++ b/modules/skeleton_3d/nodes/skeleton_ik.cpp
@@ -36,7 +36,7 @@
 
 #ifndef _3D_DISABLED
 
-#include "scene/3d/skeleton.h"
+#include "skeleton.h"
 
 FabrikInverseKinematic::ChainItem *FabrikInverseKinematic::ChainItem::find_child(const BoneId p_bone_id) {
 	for (int i = children.size() - 1; 0 <= i; --i) {
diff --git a/scene/animation/skeleton_ik.h b/modules/skeleton_3d/nodes/skeleton_ik.h
similarity index 100%
rename from scene/animation/skeleton_ik.h
rename to modules/skeleton_3d/nodes/skeleton_ik.h
diff --git a/modules/skeleton_3d/register_types.cpp b/modules/skeleton_3d/register_types.cpp
new file mode 100644
index 000000000..3b58ec6df
--- /dev/null
+++ b/modules/skeleton_3d/register_types.cpp
@@ -0,0 +1,55 @@
+
+#include "register_types.h"
+
+#include "nodes/skeleton.h"
+#include "resources/skin.h"
+
+#include "nodes/bone_attachment.h"
+#include "nodes/skeleton_ik.h"
+
+#include "nodes/physical_bone.h"
+
+#include "resources/skeleton_modification_3d.h"
+#include "resources/skeleton_modification_3d_ccdik.h"
+#include "resources/skeleton_modification_3d_fabrik.h"
+#include "resources/skeleton_modification_3d_jiggle.h"
+#include "resources/skeleton_modification_3d_lookat.h"
+#include "resources/skeleton_modification_3d_stackholder.h"
+#include "resources/skeleton_modification_3d_twoboneik.h"
+#include "resources/skeleton_modification_stack_3d.h"
+
+#ifdef TOOLS_ENABLED
+#include "editor/skeleton_editor_plugin.h"
+#include "editor/skeleton_ik_editor_plugin.h"
+#include "editor/physical_bone_plugin.h"
+#endif
+
+void register_skeleton_3d_types() {
+	ClassDB::register_class<Skeleton>();
+	ClassDB::register_class<Skin>();
+	ClassDB::register_class<SkinReference>();
+
+	ClassDB::register_class<BoneAttachment>();
+
+	ClassDB::register_class<SkeletonIK>();
+
+	ClassDB::register_class<PhysicalBone>();
+
+	ClassDB::register_class<SkeletonModificationStack3D>();
+	ClassDB::register_class<SkeletonModification3D>();
+	ClassDB::register_class<SkeletonModification3DLookAt>();
+	ClassDB::register_class<SkeletonModification3DCCDIK>();
+	ClassDB::register_class<SkeletonModification3DFABRIK>();
+	ClassDB::register_class<SkeletonModification3DJiggle>();
+	ClassDB::register_class<SkeletonModification3DTwoBoneIK>();
+	ClassDB::register_class<SkeletonModification3DStackHolder>();
+
+#ifdef TOOLS_ENABLED
+	EditorPlugins::add_by_type<SkeletonEditorPlugin>();
+	EditorPlugins::add_by_type<SkeletonIKEditorPlugin>();
+	EditorPlugins::add_by_type<PhysicalBonePlugin>();
+#endif
+}
+
+void unregister_skeleton_3d_types() {
+}
diff --git a/modules/skeleton_3d/register_types.h b/modules/skeleton_3d/register_types.h
new file mode 100644
index 000000000..978d2ad71
--- /dev/null
+++ b/modules/skeleton_3d/register_types.h
@@ -0,0 +1,3 @@
+
+void register_skeleton_3d_types();
+void unregister_skeleton_3d_types();
diff --git a/scene/resources/skeleton_modification_3d.cpp b/modules/skeleton_3d/resources/skeleton_modification_3d.cpp
similarity index 98%
rename from scene/resources/skeleton_modification_3d.cpp
rename to modules/skeleton_3d/resources/skeleton_modification_3d.cpp
index f93590f5a..011a4b5d9 100644
--- a/scene/resources/skeleton_modification_3d.cpp
+++ b/modules/skeleton_3d/resources/skeleton_modification_3d.cpp
@@ -29,9 +29,9 @@
 /*************************************************************************/
 
 #include "skeleton_modification_3d.h"
-#include "scene/3d/skeleton.h"
+#include "../nodes/skeleton.h"
 
-#include "scene/resources/skeleton_modification_stack_3d.h"
+#include "skeleton_modification_stack_3d.h"
 
 void SkeletonModification3D::set_enabled(bool p_enabled) {
 	enabled = p_enabled;
diff --git a/scene/resources/skeleton_modification_3d.h b/modules/skeleton_3d/resources/skeleton_modification_3d.h
similarity index 99%
rename from scene/resources/skeleton_modification_3d.h
rename to modules/skeleton_3d/resources/skeleton_modification_3d.h
index a9a6a2434..27be76bba 100644
--- a/scene/resources/skeleton_modification_3d.h
+++ b/modules/skeleton_3d/resources/skeleton_modification_3d.h
@@ -32,7 +32,7 @@
 #define SKELETON_MODIFICATION_3D_H
 
 #include "core/object/reference.h"
-#include "scene/3d/skeleton.h"
+#include "../nodes/skeleton.h"
 
 class SkeletonModificationStack3D;
 
diff --git a/scene/resources/skeleton_modification_3d_ccdik.cpp b/modules/skeleton_3d/resources/skeleton_modification_3d_ccdik.cpp
similarity index 99%
rename from scene/resources/skeleton_modification_3d_ccdik.cpp
rename to modules/skeleton_3d/resources/skeleton_modification_3d_ccdik.cpp
index 9f8a21606..0e5c09383 100644
--- a/scene/resources/skeleton_modification_3d_ccdik.cpp
+++ b/modules/skeleton_3d/resources/skeleton_modification_3d_ccdik.cpp
@@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/skeleton_modification_3d_ccdik.h"
-#include "scene/3d/skeleton.h"
-#include "scene/resources/skeleton_modification_stack_3d.h"
+#include "skeleton_modification_3d_ccdik.h"
+#include "../nodes/skeleton.h"
+#include "skeleton_modification_stack_3d.h"
 
 bool SkeletonModification3DCCDIK::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
diff --git a/scene/resources/skeleton_modification_3d_ccdik.h b/modules/skeleton_3d/resources/skeleton_modification_3d_ccdik.h
similarity index 98%
rename from scene/resources/skeleton_modification_3d_ccdik.h
rename to modules/skeleton_3d/resources/skeleton_modification_3d_ccdik.h
index a421053eb..2cbb66025 100644
--- a/scene/resources/skeleton_modification_3d_ccdik.h
+++ b/modules/skeleton_3d/resources/skeleton_modification_3d_ccdik.h
@@ -33,8 +33,8 @@
 /*************************************************************************/
 
 #include "core/containers/local_vector.h"
-#include "scene/3d/skeleton.h"
-#include "scene/resources/skeleton_modification_3d.h"
+#include "../nodes/skeleton.h"
+#include "skeleton_modification_3d.h"
 
 class SkeletonModification3DCCDIK : public SkeletonModification3D {
 	GDCLASS(SkeletonModification3DCCDIK, SkeletonModification3D);
diff --git a/scene/resources/skeleton_modification_3d_fabrik.cpp b/modules/skeleton_3d/resources/skeleton_modification_3d_fabrik.cpp
similarity index 99%
rename from scene/resources/skeleton_modification_3d_fabrik.cpp
rename to modules/skeleton_3d/resources/skeleton_modification_3d_fabrik.cpp
index fd5f955c3..b0d497cb7 100644
--- a/scene/resources/skeleton_modification_3d_fabrik.cpp
+++ b/modules/skeleton_3d/resources/skeleton_modification_3d_fabrik.cpp
@@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/skeleton_modification_3d_fabrik.h"
-#include "scene/3d/skeleton.h"
-#include "scene/resources/skeleton_modification_stack_3d.h"
+#include "skeleton_modification_3d_fabrik.h"
+#include "../nodes/skeleton.h"
+#include "skeleton_modification_stack_3d.h"
 
 bool SkeletonModification3DFABRIK::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
diff --git a/scene/resources/skeleton_modification_3d_fabrik.h b/modules/skeleton_3d/resources/skeleton_modification_3d_fabrik.h
similarity index 99%
rename from scene/resources/skeleton_modification_3d_fabrik.h
rename to modules/skeleton_3d/resources/skeleton_modification_3d_fabrik.h
index b1652c709..1ae6e61ff 100644
--- a/scene/resources/skeleton_modification_3d_fabrik.h
+++ b/modules/skeleton_3d/resources/skeleton_modification_3d_fabrik.h
@@ -32,7 +32,7 @@
 /*************************************************************************/
 
 #include "core/containers/local_vector.h"
-#include "scene/resources/skeleton_modification_3d.h"
+#include "skeleton_modification_3d.h"
 
 class SkeletonModification3DFABRIK : public SkeletonModification3D {
 	GDCLASS(SkeletonModification3DFABRIK, SkeletonModification3D);
diff --git a/scene/resources/skeleton_modification_3d_jiggle.cpp b/modules/skeleton_3d/resources/skeleton_modification_3d_jiggle.cpp
similarity index 99%
rename from scene/resources/skeleton_modification_3d_jiggle.cpp
rename to modules/skeleton_3d/resources/skeleton_modification_3d_jiggle.cpp
index 8a3fb8a53..bacb7bf92 100644
--- a/scene/resources/skeleton_modification_3d_jiggle.cpp
+++ b/modules/skeleton_3d/resources/skeleton_modification_3d_jiggle.cpp
@@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/skeleton_modification_3d_jiggle.h"
-#include "scene/3d/skeleton.h"
-#include "scene/resources/skeleton_modification_stack_3d.h"
+#include "skeleton_modification_3d_jiggle.h"
+#include "../nodes/skeleton.h"
+#include "skeleton_modification_stack_3d.h"
 #include "servers/physics_server.h"
 #include "scene/resources/world.h"
 
diff --git a/scene/resources/skeleton_modification_3d_jiggle.h b/modules/skeleton_3d/resources/skeleton_modification_3d_jiggle.h
similarity index 99%
rename from scene/resources/skeleton_modification_3d_jiggle.h
rename to modules/skeleton_3d/resources/skeleton_modification_3d_jiggle.h
index b130dff43..47c2b7d5d 100644
--- a/scene/resources/skeleton_modification_3d_jiggle.h
+++ b/modules/skeleton_3d/resources/skeleton_modification_3d_jiggle.h
@@ -32,7 +32,7 @@
 /*************************************************************************/
 
 #include "core/containers/local_vector.h"
-#include "scene/resources/skeleton_modification_3d.h"
+#include "skeleton_modification_3d.h"
 
 class SkeletonModification3DJiggle : public SkeletonModification3D {
 	GDCLASS(SkeletonModification3DJiggle, SkeletonModification3D);
diff --git a/scene/resources/skeleton_modification_3d_lookat.cpp b/modules/skeleton_3d/resources/skeleton_modification_3d_lookat.cpp
similarity index 98%
rename from scene/resources/skeleton_modification_3d_lookat.cpp
rename to modules/skeleton_3d/resources/skeleton_modification_3d_lookat.cpp
index 7fa615489..ea31c3154 100644
--- a/scene/resources/skeleton_modification_3d_lookat.cpp
+++ b/modules/skeleton_3d/resources/skeleton_modification_3d_lookat.cpp
@@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/skeleton_modification_3d_lookat.h"
-#include "scene/3d/skeleton.h"
-#include "scene/resources/skeleton_modification_stack_3d.h"
+#include "skeleton_modification_3d_lookat.h"
+#include "../nodes/skeleton.h"
+#include "skeleton_modification_stack_3d.h"
 
 bool SkeletonModification3DLookAt::_set(const StringName &p_path, const Variant &p_value) {
 	if (p_path == "lock_rotation_to_plane") {
diff --git a/scene/resources/skeleton_modification_3d_lookat.h b/modules/skeleton_3d/resources/skeleton_modification_3d_lookat.h
similarity index 98%
rename from scene/resources/skeleton_modification_3d_lookat.h
rename to modules/skeleton_3d/resources/skeleton_modification_3d_lookat.h
index 79fe876fa..e312f7e0a 100644
--- a/scene/resources/skeleton_modification_3d_lookat.h
+++ b/modules/skeleton_3d/resources/skeleton_modification_3d_lookat.h
@@ -31,7 +31,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/skeleton_modification_3d.h"
+#include "skeleton_modification_3d.h"
 
 class SkeletonModification3DLookAt : public SkeletonModification3D {
 	GDCLASS(SkeletonModification3DLookAt, SkeletonModification3D);
diff --git a/scene/resources/skeleton_modification_3d_stackholder.cpp b/modules/skeleton_3d/resources/skeleton_modification_3d_stackholder.cpp
similarity index 96%
rename from scene/resources/skeleton_modification_3d_stackholder.cpp
rename to modules/skeleton_3d/resources/skeleton_modification_3d_stackholder.cpp
index ea8d05cd3..0cf91a8cd 100644
--- a/scene/resources/skeleton_modification_3d_stackholder.cpp
+++ b/modules/skeleton_3d/resources/skeleton_modification_3d_stackholder.cpp
@@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/skeleton_modification_3d_stackholder.h"
-#include "scene/3d/skeleton.h"
-#include "scene/resources/skeleton_modification_stack_3d.h"
+#include "skeleton_modification_3d_stackholder.h"
+#include "../nodes/skeleton.h"
+#include "skeleton_modification_stack_3d.h"
 
 bool SkeletonModification3DStackHolder::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
diff --git a/scene/resources/skeleton_modification_3d_stackholder.h b/modules/skeleton_3d/resources/skeleton_modification_3d_stackholder.h
similarity index 98%
rename from scene/resources/skeleton_modification_3d_stackholder.h
rename to modules/skeleton_3d/resources/skeleton_modification_3d_stackholder.h
index 7b5819b1c..2b79cd289 100644
--- a/scene/resources/skeleton_modification_3d_stackholder.h
+++ b/modules/skeleton_3d/resources/skeleton_modification_3d_stackholder.h
@@ -31,7 +31,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/skeleton_modification_3d.h"
+#include "skeleton_modification_3d.h"
 
 class SkeletonModification3DStackHolder : public SkeletonModification3D {
 	GDCLASS(SkeletonModification3DStackHolder, SkeletonModification3D);
diff --git a/scene/resources/skeleton_modification_3d_twoboneik.cpp b/modules/skeleton_3d/resources/skeleton_modification_3d_twoboneik.cpp
similarity index 99%
rename from scene/resources/skeleton_modification_3d_twoboneik.cpp
rename to modules/skeleton_3d/resources/skeleton_modification_3d_twoboneik.cpp
index dfe0768c2..0bb22da99 100644
--- a/scene/resources/skeleton_modification_3d_twoboneik.cpp
+++ b/modules/skeleton_3d/resources/skeleton_modification_3d_twoboneik.cpp
@@ -28,9 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/skeleton_modification_3d_twoboneik.h"
-#include "scene/3d/skeleton.h"
-#include "scene/resources/skeleton_modification_stack_3d.h"
+#include "skeleton_modification_3d_twoboneik.h"
+#include "../nodes/skeleton.h"
+#include "skeleton_modification_stack_3d.h"
 
 bool SkeletonModification3DTwoBoneIK::_set(const StringName &p_path, const Variant &p_value) {
 	String path = p_path;
diff --git a/scene/resources/skeleton_modification_3d_twoboneik.h b/modules/skeleton_3d/resources/skeleton_modification_3d_twoboneik.h
similarity index 98%
rename from scene/resources/skeleton_modification_3d_twoboneik.h
rename to modules/skeleton_3d/resources/skeleton_modification_3d_twoboneik.h
index 66d6c4711..aac2250eb 100644
--- a/scene/resources/skeleton_modification_3d_twoboneik.h
+++ b/modules/skeleton_3d/resources/skeleton_modification_3d_twoboneik.h
@@ -32,7 +32,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "scene/resources/skeleton_modification_3d.h"
+#include "skeleton_modification_3d.h"
 
 class Skeleton;
 
diff --git a/scene/resources/skeleton_modification_stack_3d.cpp b/modules/skeleton_3d/resources/skeleton_modification_stack_3d.cpp
similarity index 99%
rename from scene/resources/skeleton_modification_stack_3d.cpp
rename to modules/skeleton_3d/resources/skeleton_modification_stack_3d.cpp
index 2a0c54826..8eb1be9f0 100644
--- a/scene/resources/skeleton_modification_stack_3d.cpp
+++ b/modules/skeleton_3d/resources/skeleton_modification_stack_3d.cpp
@@ -29,7 +29,7 @@
 /*************************************************************************/
 
 #include "skeleton_modification_stack_3d.h"
-#include "scene/3d/skeleton.h"
+#include "../nodes/skeleton.h"
 
 #include "skeleton_modification_3d.h"
 
diff --git a/scene/resources/skeleton_modification_stack_3d.h b/modules/skeleton_3d/resources/skeleton_modification_stack_3d.h
similarity index 99%
rename from scene/resources/skeleton_modification_stack_3d.h
rename to modules/skeleton_3d/resources/skeleton_modification_stack_3d.h
index d778b0802..7c1adbfae 100644
--- a/scene/resources/skeleton_modification_stack_3d.h
+++ b/modules/skeleton_3d/resources/skeleton_modification_stack_3d.h
@@ -32,7 +32,7 @@
 /*************************************************************************/
 
 #include "core/containers/vector.h"
-#include "scene/3d/skeleton.h"
+#include "core/object/resource.h"
 
 class Skeleton;
 class SkeletonModification3D;
diff --git a/scene/resources/skin.cpp b/modules/skeleton_3d/resources/skin.cpp
similarity index 100%
rename from scene/resources/skin.cpp
rename to modules/skeleton_3d/resources/skin.cpp
diff --git a/scene/resources/skin.h b/modules/skeleton_3d/resources/skin.h
similarity index 100%
rename from scene/resources/skin.h
rename to modules/skeleton_3d/resources/skin.h
diff --git a/scene/3d/importer_mesh_instance_3d.cpp b/scene/3d/importer_mesh_instance_3d.cpp
index 7cd6a8153..f37a5be98 100644
--- a/scene/3d/importer_mesh_instance_3d.cpp
+++ b/scene/3d/importer_mesh_instance_3d.cpp
@@ -39,12 +39,14 @@ Ref<ImporterMesh> ImporterMeshInstance3D::get_mesh() const {
 	return mesh;
 }
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 void ImporterMeshInstance3D::set_skin(const Ref<Skin> &p_skin) {
 	skin = p_skin;
 }
 Ref<Skin> ImporterMeshInstance3D::get_skin() const {
 	return skin;
 }
+#endif
 
 void ImporterMeshInstance3D::set_surface_material(int p_idx, const Ref<Material> &p_material) {
 	ERR_FAIL_COND(p_idx < 0);
@@ -72,14 +74,15 @@ NodePath ImporterMeshInstance3D::get_skeleton_path() const {
 void ImporterMeshInstance3D::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_mesh", "mesh"), &ImporterMeshInstance3D::set_mesh);
 	ClassDB::bind_method(D_METHOD("get_mesh"), &ImporterMeshInstance3D::get_mesh);
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "ImporterMesh"), "set_mesh", "get_mesh");
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 	ClassDB::bind_method(D_METHOD("set_skin", "skin"), &ImporterMeshInstance3D::set_skin);
 	ClassDB::bind_method(D_METHOD("get_skin"), &ImporterMeshInstance3D::get_skin);
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "skin", PROPERTY_HINT_RESOURCE_TYPE, "Skin"), "set_skin", "get_skin");
+#endif
 
 	ClassDB::bind_method(D_METHOD("set_skeleton_path", "skeleton_path"), &ImporterMeshInstance3D::set_skeleton_path);
 	ClassDB::bind_method(D_METHOD("get_skeleton_path"), &ImporterMeshInstance3D::get_skeleton_path);
-
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "ImporterMesh"), "set_mesh", "get_mesh");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "skin", PROPERTY_HINT_RESOURCE_TYPE, "Skin"), "set_skin", "get_skin");
 	ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "skeleton_path", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "Skeleton"), "set_skeleton_path", "get_skeleton_path");
 }
diff --git a/scene/3d/importer_mesh_instance_3d.h b/scene/3d/importer_mesh_instance_3d.h
index e5dfc5ad7..84934aeee 100644
--- a/scene/3d/importer_mesh_instance_3d.h
+++ b/scene/3d/importer_mesh_instance_3d.h
@@ -32,7 +32,12 @@
 #define IMPORTER_MESH_INSTANCE_3D_H
 
 #include "scene/3d/spatial.h"
-#include "scene/resources/skin.h"
+
+#include "modules/modules_enabled.gen.h"
+
+#ifdef MODULE_SKELETON_3D_ENABLED
+#include "modules/skeleton_3d/resources/skin.h"
+#endif
 
 class ImporterMesh;
 
@@ -51,8 +56,10 @@ public:
 	void set_mesh(const Ref<ImporterMesh> &p_mesh);
 	Ref<ImporterMesh> get_mesh() const;
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 	void set_skin(const Ref<Skin> &p_skin);
 	Ref<Skin> get_skin() const;
+#endif
 
 	void set_surface_material(int p_idx, const Ref<Material> &p_material);
 	Ref<Material> get_surface_material(int p_idx) const;
diff --git a/scene/3d/mesh_instance.cpp b/scene/3d/mesh_instance.cpp
index 6c1fca8e2..0b937f4d0 100644
--- a/scene/3d/mesh_instance.cpp
+++ b/scene/3d/mesh_instance.cpp
@@ -31,16 +31,20 @@
 #include "mesh_instance.h"
 
 #include "collision_shape.h"
-#include "core/core_string_names.h"
 #include "core/config/project_settings.h"
+#include "core/core_string_names.h"
 #include "physics_body.h"
-#include "scene/3d/skeleton.h"
 #include "scene/resources/material.h"
 #include "scene/resources/mesh.h"
-#include "scene/resources/skin.h"
 #include "scene/scene_string_names.h"
 #include "servers/rendering/rendering_server_globals.h"
-#include "skeleton.h"
+
+#include "modules/modules_enabled.gen.h"
+
+#ifdef MODULE_SKELETON_3D_ENABLED
+#include "modules/skeleton_3d/nodes/skeleton.h"
+#include "modules/skeleton_3d/resources/skin.h"
+#endif
 
 bool MeshInstance::_set(const StringName &p_name, const Variant &p_value) {
 	//this is not _too_ bad performance wise, really. it only arrives here if the property was not set anywhere else.
@@ -125,10 +129,12 @@ void MeshInstance::set_mesh(const Ref<Mesh> &p_mesh) {
 		skin_ref->get_skeleton_node()->disconnect("pose_updated", this, "_update_skinning");
 	}
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 	if (software_skinning) {
 		memdelete(software_skinning);
 		software_skinning = nullptr;
 	}
+#endif
 
 	mesh = p_mesh;
 
@@ -144,7 +150,9 @@ void MeshInstance::set_mesh(const Ref<Mesh> &p_mesh) {
 		mesh->connect(CoreStringNames::get_singleton()->changed, this, SceneStringNames::get_singleton()->_mesh_changed);
 		materials.resize(mesh->get_surface_count());
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 		_initialize_skinning(false, true);
+#endif
 	} else {
 		set_base(RID());
 	}
@@ -157,6 +165,7 @@ Ref<Mesh> MeshInstance::get_mesh() const {
 	return mesh;
 }
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 void MeshInstance::_resolve_skeleton_path() {
 	Ref<SkinReference> new_skin_reference;
 
@@ -523,7 +532,9 @@ void MeshInstance::_update_skinning() {
 
 	software_skinning_flags |= SoftwareSkinning::FLAG_BONES_READY;
 }
+#endif
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 void MeshInstance::set_skin(const Ref<Skin> &p_skin) {
 	skin_internal = p_skin;
 	skin = p_skin;
@@ -548,6 +559,7 @@ void MeshInstance::set_skeleton_path(const NodePath &p_skeleton) {
 NodePath MeshInstance::get_skeleton_path() {
 	return skeleton_path;
 }
+#endif
 
 AABB MeshInstance::get_aabb() const {
 	if (!mesh.is_null()) {
@@ -665,6 +677,7 @@ void MeshInstance::create_convex_collision(bool p_clean, bool p_simplify) {
 }
 
 void MeshInstance::_notification(int p_what) {
+#ifdef MODULE_SKELETON_3D_ENABLED
 	if (p_what == NOTIFICATION_ENTER_TREE) {
 		_resolve_skeleton_path();
 	}
@@ -679,6 +692,7 @@ void MeshInstance::_notification(int p_what) {
 			}
 		}
 	}
+#endif
 }
 
 int MeshInstance::get_surface_material_count() const {
@@ -696,9 +710,11 @@ void MeshInstance::set_surface_material(int p_surface, const Ref<Material> &p_ma
 		RS::get_singleton()->instance_set_surface_material(get_instance(), p_surface, RID());
 	}
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 	if (software_skinning) {
 		_initialize_skinning(true);
 	}
+#endif
 }
 
 Ref<Material> MeshInstance::get_surface_material(int p_surface) const {
@@ -746,6 +762,7 @@ void MeshInstance::set_material_overlay(const Ref<Material> &p_material) {
 	GeometryInstance::set_material_overlay(p_material);
 }
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 void MeshInstance::set_software_skinning_transform_normals(bool p_enabled) {
 	if (p_enabled == is_software_skinning_transform_normals_enabled()) {
 		return;
@@ -765,14 +782,17 @@ void MeshInstance::set_software_skinning_transform_normals(bool p_enabled) {
 bool MeshInstance::is_software_skinning_transform_normals_enabled() const {
 	return 0 != (software_skinning_flags & SoftwareSkinning::FLAG_TRANSFORM_NORMALS);
 }
+#endif
 
 void MeshInstance::_mesh_changed() {
 	ERR_FAIL_COND(mesh.is_null());
 	materials.resize(mesh->get_surface_count());
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 	if (software_skinning) {
 		_initialize_skinning(true);
 	}
+#endif
 }
 
 void MeshInstance::create_debug_tangents() {
@@ -1343,18 +1363,29 @@ void MeshInstance::_merge_log(String p_string) const {
 void MeshInstance::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_mesh", "mesh"), &MeshInstance::set_mesh);
 	ClassDB::bind_method(D_METHOD("get_mesh"), &MeshInstance::get_mesh);
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), "set_mesh", "get_mesh");
+
+#ifdef MODULE_SKELETON_3D_ENABLED
 	ClassDB::bind_method(D_METHOD("set_skeleton_path", "skeleton_path"), &MeshInstance::set_skeleton_path);
 	ClassDB::bind_method(D_METHOD("get_skeleton_path"), &MeshInstance::get_skeleton_path);
+	ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "skeleton", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "Skeleton"), "set_skeleton_path", "get_skeleton_path");
+
 	ClassDB::bind_method(D_METHOD("set_skin", "skin"), &MeshInstance::set_skin);
 	ClassDB::bind_method(D_METHOD("get_skin"), &MeshInstance::get_skin);
+	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "skin", PROPERTY_HINT_RESOURCE_TYPE, "Skin"), "set_skin", "get_skin");
+#endif
 
 	ClassDB::bind_method(D_METHOD("get_surface_material_count"), &MeshInstance::get_surface_material_count);
 	ClassDB::bind_method(D_METHOD("set_surface_material", "surface", "material"), &MeshInstance::set_surface_material);
 	ClassDB::bind_method(D_METHOD("get_surface_material", "surface"), &MeshInstance::get_surface_material);
 	ClassDB::bind_method(D_METHOD("get_active_material", "surface"), &MeshInstance::get_active_material);
 
+#ifdef MODULE_SKELETON_3D_ENABLED
+	ADD_GROUP("Software Skinning", "software_skinning");
 	ClassDB::bind_method(D_METHOD("set_software_skinning_transform_normals", "enabled"), &MeshInstance::set_software_skinning_transform_normals);
 	ClassDB::bind_method(D_METHOD("is_software_skinning_transform_normals_enabled"), &MeshInstance::is_software_skinning_transform_normals_enabled);
+	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "software_skinning_transform_normals"), "set_software_skinning_transform_normals", "is_software_skinning_transform_normals_enabled");
+#endif
 
 	ClassDB::bind_method(D_METHOD("create_trimesh_collision"), &MeshInstance::create_trimesh_collision);
 	ClassDB::set_method_flags("MeshInstance", "create_trimesh_collision", METHOD_FLAGS_DEFAULT);
@@ -1363,7 +1394,10 @@ void MeshInstance::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("create_convex_collision", "clean", "simplify"), &MeshInstance::create_convex_collision, DEFVAL(true), DEFVAL(false));
 	ClassDB::set_method_flags("MeshInstance", "create_convex_collision", METHOD_FLAGS_DEFAULT);
 	ClassDB::bind_method(D_METHOD("_mesh_changed"), &MeshInstance::_mesh_changed);
+
+#ifdef MODULE_SKELETON_3D_ENABLED
 	ClassDB::bind_method(D_METHOD("_update_skinning"), &MeshInstance::_update_skinning);
+#endif
 
 	ClassDB::bind_method(D_METHOD("create_debug_tangents"), &MeshInstance::create_debug_tangents);
 	ClassDB::set_method_flags("MeshInstance", "create_debug_tangents", METHOD_FLAGS_DEFAULT | METHOD_FLAG_EDITOR);
@@ -1371,24 +1405,21 @@ void MeshInstance::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("is_mergeable_with", "other_mesh_instance"), &MeshInstance::is_mergeable_with);
 	ClassDB::bind_method(D_METHOD("merge_meshes", "mesh_instances", "use_global_space", "check_compatibility"), &MeshInstance::merge_meshes, DEFVAL(Vector<Variant>()), DEFVAL(false), DEFVAL(true));
 	ClassDB::set_method_flags("MeshInstance", "merge_meshes", METHOD_FLAGS_DEFAULT);
-
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "mesh", PROPERTY_HINT_RESOURCE_TYPE, "Mesh"), "set_mesh", "get_mesh");
-	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "skin", PROPERTY_HINT_RESOURCE_TYPE, "Skin"), "set_skin", "get_skin");
-	ADD_PROPERTY(PropertyInfo(Variant::NODE_PATH, "skeleton", PROPERTY_HINT_NODE_PATH_VALID_TYPES, "Skeleton"), "set_skeleton_path", "get_skeleton_path");
-
-	ADD_GROUP("Software Skinning", "software_skinning");
-	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "software_skinning_transform_normals"), "set_software_skinning_transform_normals", "is_software_skinning_transform_normals_enabled");
 }
 
 MeshInstance::MeshInstance() {
+#ifdef MODULE_SKELETON_3D_ENABLED
 	skeleton_path = NodePath("..");
 	software_skinning = nullptr;
 	software_skinning_flags = SoftwareSkinning::FLAG_TRANSFORM_NORMALS;
+#endif
 }
 
 MeshInstance::~MeshInstance() {
+#ifdef MODULE_SKELETON_3D_ENABLED
 	if (software_skinning) {
 		memdelete(software_skinning);
 		software_skinning = nullptr;
 	}
+#endif
 }
diff --git a/scene/3d/mesh_instance.h b/scene/3d/mesh_instance.h
index d52f745a9..0ded7b6fa 100644
--- a/scene/3d/mesh_instance.h
+++ b/scene/3d/mesh_instance.h
@@ -35,9 +35,14 @@
 #include "core/containers/local_vector.h"
 #include "core/object/reference.h"
 
-class Mesh;
+#include "modules/modules_enabled.gen.h"
+
+#ifdef MODULE_SKELETON_3D_ENABLED
 class Skin;
 class SkinReference;
+#endif
+
+class Mesh;
 class NodePath;
 
 class MeshInstance : public GeometryInstance {
@@ -45,6 +50,8 @@ class MeshInstance : public GeometryInstance {
 
 protected:
 	Ref<Mesh> mesh;
+
+#ifdef MODULE_SKELETON_3D_ENABLED
 	Ref<Skin> skin;
 	Ref<Skin> skin_internal;
 	Ref<SkinReference> skin_ref;
@@ -74,6 +81,7 @@ protected:
 
 	SoftwareSkinning *software_skinning;
 	uint32_t software_skinning_flags;
+#endif
 
 	struct BlendShapeTrack {
 		int idx;
@@ -88,6 +96,8 @@ protected:
 	Vector<Ref<Material>> materials;
 
 	void _mesh_changed();
+
+#ifdef MODULE_SKELETON_3D_ENABLED
 	void _resolve_skeleton_path();
 
 	bool _is_software_skinning_enabled() const;
@@ -95,6 +105,7 @@ protected:
 
 	void _initialize_skinning(bool p_force_reset = false, bool p_call_attach_skeleton = true);
 	void _update_skinning();
+#endif
 
 private:
 	// merging
@@ -118,11 +129,13 @@ public:
 	void set_mesh(const Ref<Mesh> &p_mesh);
 	Ref<Mesh> get_mesh() const;
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 	void set_skin(const Ref<Skin> &p_skin);
 	Ref<Skin> get_skin() const;
 
 	void set_skeleton_path(const NodePath &p_skeleton);
 	NodePath get_skeleton_path();
+#endif
 
 	int get_surface_material_count() const;
 	void set_surface_material(int p_surface, const Ref<Material> &p_material);
diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp
index eb98a21f3..0d3770d88 100644
--- a/scene/3d/physics_body.cpp
+++ b/scene/3d/physics_body.cpp
@@ -30,16 +30,16 @@
 
 #include "physics_body.h"
 
-#include "core/core_string_names.h"
 #include "core/config/engine.h"
+#include "core/config/project_settings.h"
 #include "core/containers/list.h"
+#include "core/containers/rid.h"
+#include "core/core_string_names.h"
 #include "core/object/method_bind_ext.gen.inc"
 #include "core/object/object.h"
-#include "core/config/project_settings.h"
-#include "core/containers/rid.h"
 #include "scene/resources/physics_material.h"
 #include "scene/scene_string_names.h"
-#include "skeleton.h"
+//#include "skeleton.h"
 
 #ifdef TOOLS_ENABLED
 #include "editor/plugins/spatial_editor_plugin.h"
@@ -1622,1201 +1622,3 @@ KinematicCollision::KinematicCollision() {
 
 KinematicCollision::~KinematicCollision() {
 }
-
-///////////////////////////////////////
-
-bool PhysicalBone::JointData::_set(const StringName &p_name, const Variant &p_value, RID j) {
-	return false;
-}
-
-bool PhysicalBone::JointData::_get(const StringName &p_name, Variant &r_ret) const {
-	return false;
-}
-
-void PhysicalBone::JointData::_get_property_list(List<PropertyInfo> *p_list) const {
-}
-
-void PhysicalBone::apply_central_impulse(const Vector3 &p_impulse) {
-	PhysicsServer::get_singleton()->body_apply_central_impulse(get_rid(), p_impulse);
-}
-
-void PhysicalBone::apply_impulse(const Vector3 &p_pos, const Vector3 &p_impulse) {
-	PhysicsServer::get_singleton()->body_apply_impulse(get_rid(), p_pos, p_impulse);
-}
-
-void PhysicalBone::reset_physics_simulation_state() {
-	if (simulate_physics) {
-		_start_physics_simulation();
-	} else {
-		_stop_physics_simulation();
-	}
-}
-
-void PhysicalBone::reset_to_rest_position() {
-	if (parent_skeleton) {
-		if (-1 == bone_id) {
-			set_global_transform(parent_skeleton->get_global_transform() * body_offset);
-		} else {
-			set_global_transform(parent_skeleton->get_global_transform() * parent_skeleton->get_bone_global_pose(bone_id) * body_offset);
-		}
-	}
-}
-
-bool PhysicalBone::PinJointData::_set(const StringName &p_name, const Variant &p_value, RID j) {
-	if (JointData::_set(p_name, p_value, j)) {
-		return true;
-	}
-
-	if ("joint_constraints/bias" == p_name) {
-		bias = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->pin_joint_set_param(j, PhysicsServer::PIN_JOINT_BIAS, bias);
-		}
-
-	} else if ("joint_constraints/damping" == p_name) {
-		damping = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->pin_joint_set_param(j, PhysicsServer::PIN_JOINT_DAMPING, damping);
-		}
-
-	} else if ("joint_constraints/impulse_clamp" == p_name) {
-		impulse_clamp = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->pin_joint_set_param(j, PhysicsServer::PIN_JOINT_IMPULSE_CLAMP, impulse_clamp);
-		}
-
-	} else {
-		return false;
-	}
-
-	return true;
-}
-
-bool PhysicalBone::PinJointData::_get(const StringName &p_name, Variant &r_ret) const {
-	if (JointData::_get(p_name, r_ret)) {
-		return true;
-	}
-
-	if ("joint_constraints/bias" == p_name) {
-		r_ret = bias;
-	} else if ("joint_constraints/damping" == p_name) {
-		r_ret = damping;
-	} else if ("joint_constraints/impulse_clamp" == p_name) {
-		r_ret = impulse_clamp;
-	} else {
-		return false;
-	}
-
-	return true;
-}
-
-void PhysicalBone::PinJointData::_get_property_list(List<PropertyInfo> *p_list) const {
-	JointData::_get_property_list(p_list);
-
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/bias", PROPERTY_HINT_RANGE, "0.01,0.99,0.01"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/damping", PROPERTY_HINT_RANGE, "0.01,8.0,0.01"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/impulse_clamp", PROPERTY_HINT_RANGE, "0.0,64.0,0.01"));
-}
-
-bool PhysicalBone::ConeJointData::_set(const StringName &p_name, const Variant &p_value, RID j) {
-	if (JointData::_set(p_name, p_value, j)) {
-		return true;
-	}
-
-	if ("joint_constraints/swing_span" == p_name) {
-		swing_span = Math::deg2rad(real_t(p_value));
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->cone_twist_joint_set_param(j, PhysicsServer::CONE_TWIST_JOINT_SWING_SPAN, swing_span);
-		}
-
-	} else if ("joint_constraints/twist_span" == p_name) {
-		twist_span = Math::deg2rad(real_t(p_value));
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->cone_twist_joint_set_param(j, PhysicsServer::CONE_TWIST_JOINT_TWIST_SPAN, twist_span);
-		}
-
-	} else if ("joint_constraints/bias" == p_name) {
-		bias = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->cone_twist_joint_set_param(j, PhysicsServer::CONE_TWIST_JOINT_BIAS, bias);
-		}
-
-	} else if ("joint_constraints/softness" == p_name) {
-		softness = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->cone_twist_joint_set_param(j, PhysicsServer::CONE_TWIST_JOINT_SOFTNESS, softness);
-		}
-
-	} else if ("joint_constraints/relaxation" == p_name) {
-		relaxation = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->cone_twist_joint_set_param(j, PhysicsServer::CONE_TWIST_JOINT_RELAXATION, relaxation);
-		}
-
-	} else {
-		return false;
-	}
-
-	return true;
-}
-
-bool PhysicalBone::ConeJointData::_get(const StringName &p_name, Variant &r_ret) const {
-	if (JointData::_get(p_name, r_ret)) {
-		return true;
-	}
-
-	if ("joint_constraints/swing_span" == p_name) {
-		r_ret = Math::rad2deg(swing_span);
-	} else if ("joint_constraints/twist_span" == p_name) {
-		r_ret = Math::rad2deg(twist_span);
-	} else if ("joint_constraints/bias" == p_name) {
-		r_ret = bias;
-	} else if ("joint_constraints/softness" == p_name) {
-		r_ret = softness;
-	} else if ("joint_constraints/relaxation" == p_name) {
-		r_ret = relaxation;
-	} else {
-		return false;
-	}
-
-	return true;
-}
-
-void PhysicalBone::ConeJointData::_get_property_list(List<PropertyInfo> *p_list) const {
-	JointData::_get_property_list(p_list);
-
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/swing_span", PROPERTY_HINT_RANGE, "-180,180,0.01"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/twist_span", PROPERTY_HINT_RANGE, "-40000,40000,0.1,or_lesser,or_greater"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/bias", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/softness", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/relaxation", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"));
-}
-
-bool PhysicalBone::HingeJointData::_set(const StringName &p_name, const Variant &p_value, RID j) {
-	if (JointData::_set(p_name, p_value, j)) {
-		return true;
-	}
-
-	if ("joint_constraints/angular_limit_enabled" == p_name) {
-		angular_limit_enabled = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->hinge_joint_set_flag(j, PhysicsServer::HINGE_JOINT_FLAG_USE_LIMIT, angular_limit_enabled);
-		}
-
-	} else if ("joint_constraints/angular_limit_upper" == p_name) {
-		angular_limit_upper = Math::deg2rad(real_t(p_value));
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->hinge_joint_set_param(j, PhysicsServer::HINGE_JOINT_LIMIT_UPPER, angular_limit_upper);
-		}
-
-	} else if ("joint_constraints/angular_limit_lower" == p_name) {
-		angular_limit_lower = Math::deg2rad(real_t(p_value));
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->hinge_joint_set_param(j, PhysicsServer::HINGE_JOINT_LIMIT_LOWER, angular_limit_lower);
-		}
-
-	} else if ("joint_constraints/angular_limit_bias" == p_name) {
-		angular_limit_bias = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->hinge_joint_set_param(j, PhysicsServer::HINGE_JOINT_LIMIT_BIAS, angular_limit_bias);
-		}
-
-	} else if ("joint_constraints/angular_limit_softness" == p_name) {
-		angular_limit_softness = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->hinge_joint_set_param(j, PhysicsServer::HINGE_JOINT_LIMIT_SOFTNESS, angular_limit_softness);
-		}
-
-	} else if ("joint_constraints/angular_limit_relaxation" == p_name) {
-		angular_limit_relaxation = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->hinge_joint_set_param(j, PhysicsServer::HINGE_JOINT_LIMIT_RELAXATION, angular_limit_relaxation);
-		}
-
-	} else {
-		return false;
-	}
-
-	return true;
-}
-
-bool PhysicalBone::HingeJointData::_get(const StringName &p_name, Variant &r_ret) const {
-	if (JointData::_get(p_name, r_ret)) {
-		return true;
-	}
-
-	if ("joint_constraints/angular_limit_enabled" == p_name) {
-		r_ret = angular_limit_enabled;
-	} else if ("joint_constraints/angular_limit_upper" == p_name) {
-		r_ret = Math::rad2deg(angular_limit_upper);
-	} else if ("joint_constraints/angular_limit_lower" == p_name) {
-		r_ret = Math::rad2deg(angular_limit_lower);
-	} else if ("joint_constraints/angular_limit_bias" == p_name) {
-		r_ret = angular_limit_bias;
-	} else if ("joint_constraints/angular_limit_softness" == p_name) {
-		r_ret = angular_limit_softness;
-	} else if ("joint_constraints/angular_limit_relaxation" == p_name) {
-		r_ret = angular_limit_relaxation;
-	} else {
-		return false;
-	}
-
-	return true;
-}
-
-void PhysicalBone::HingeJointData::_get_property_list(List<PropertyInfo> *p_list) const {
-	JointData::_get_property_list(p_list);
-
-	p_list->push_back(PropertyInfo(Variant::BOOL, "joint_constraints/angular_limit_enabled"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_upper", PROPERTY_HINT_RANGE, "-180,180,0.01"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_lower", PROPERTY_HINT_RANGE, "-180,180,0.01"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_bias", PROPERTY_HINT_RANGE, "0.01,0.99,0.01"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_softness", PROPERTY_HINT_RANGE, "0.01,16,0.01"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_relaxation", PROPERTY_HINT_RANGE, "0.01,16,0.01"));
-}
-
-bool PhysicalBone::SliderJointData::_set(const StringName &p_name, const Variant &p_value, RID j) {
-	if (JointData::_set(p_name, p_value, j)) {
-		return true;
-	}
-
-	if ("joint_constraints/linear_limit_upper" == p_name) {
-		linear_limit_upper = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_UPPER, linear_limit_upper);
-		}
-
-	} else if ("joint_constraints/linear_limit_lower" == p_name) {
-		linear_limit_lower = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_LOWER, linear_limit_lower);
-		}
-
-	} else if ("joint_constraints/linear_limit_softness" == p_name) {
-		linear_limit_softness = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_SOFTNESS, linear_limit_softness);
-		}
-
-	} else if ("joint_constraints/linear_limit_restitution" == p_name) {
-		linear_limit_restitution = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_RESTITUTION, linear_limit_restitution);
-		}
-
-	} else if ("joint_constraints/linear_limit_damping" == p_name) {
-		linear_limit_damping = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_DAMPING, linear_limit_restitution);
-		}
-
-	} else if ("joint_constraints/angular_limit_upper" == p_name) {
-		angular_limit_upper = Math::deg2rad(real_t(p_value));
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_UPPER, angular_limit_upper);
-		}
-
-	} else if ("joint_constraints/angular_limit_lower" == p_name) {
-		angular_limit_lower = Math::deg2rad(real_t(p_value));
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_LOWER, angular_limit_lower);
-		}
-
-	} else if ("joint_constraints/angular_limit_softness" == p_name) {
-		angular_limit_softness = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_SOFTNESS, angular_limit_softness);
-		}
-
-	} else if ("joint_constraints/angular_limit_restitution" == p_name) {
-		angular_limit_restitution = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_SOFTNESS, angular_limit_softness);
-		}
-
-	} else if ("joint_constraints/angular_limit_damping" == p_name) {
-		angular_limit_damping = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->slider_joint_set_param(j, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_DAMPING, angular_limit_damping);
-		}
-
-	} else {
-		return false;
-	}
-
-	return true;
-}
-
-bool PhysicalBone::SliderJointData::_get(const StringName &p_name, Variant &r_ret) const {
-	if (JointData::_get(p_name, r_ret)) {
-		return true;
-	}
-
-	if ("joint_constraints/linear_limit_upper" == p_name) {
-		r_ret = linear_limit_upper;
-	} else if ("joint_constraints/linear_limit_lower" == p_name) {
-		r_ret = linear_limit_lower;
-	} else if ("joint_constraints/linear_limit_softness" == p_name) {
-		r_ret = linear_limit_softness;
-	} else if ("joint_constraints/linear_limit_restitution" == p_name) {
-		r_ret = linear_limit_restitution;
-	} else if ("joint_constraints/linear_limit_damping" == p_name) {
-		r_ret = linear_limit_damping;
-	} else if ("joint_constraints/angular_limit_upper" == p_name) {
-		r_ret = Math::rad2deg(angular_limit_upper);
-	} else if ("joint_constraints/angular_limit_lower" == p_name) {
-		r_ret = Math::rad2deg(angular_limit_lower);
-	} else if ("joint_constraints/angular_limit_softness" == p_name) {
-		r_ret = angular_limit_softness;
-	} else if ("joint_constraints/angular_limit_restitution" == p_name) {
-		r_ret = angular_limit_restitution;
-	} else if ("joint_constraints/angular_limit_damping" == p_name) {
-		r_ret = angular_limit_damping;
-	} else {
-		return false;
-	}
-
-	return true;
-}
-
-void PhysicalBone::SliderJointData::_get_property_list(List<PropertyInfo> *p_list) const {
-	JointData::_get_property_list(p_list);
-
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/linear_limit_upper"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/linear_limit_lower"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/linear_limit_softness", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/linear_limit_restitution", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/linear_limit_damping", PROPERTY_HINT_RANGE, "0,16.0,0.01"));
-
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_upper", PROPERTY_HINT_RANGE, "-180,180,0.01"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_lower", PROPERTY_HINT_RANGE, "-180,180,0.01"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_softness", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_restitution", PROPERTY_HINT_RANGE, "0.01,16.0,0.01"));
-	p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/angular_limit_damping", PROPERTY_HINT_RANGE, "0,16.0,0.01"));
-}
-
-bool PhysicalBone::SixDOFJointData::_set(const StringName &p_name, const Variant &p_value, RID j) {
-	if (JointData::_set(p_name, p_value, j)) {
-		return true;
-	}
-
-	String path = p_name;
-
-	if (!path.begins_with("joint_constraints/")) {
-		return false;
-	}
-
-	Vector3::Axis axis;
-	{
-		const String axis_s = path.get_slicec('/', 1);
-		if ("x" == axis_s) {
-			axis = Vector3::AXIS_X;
-		} else if ("y" == axis_s) {
-			axis = Vector3::AXIS_Y;
-		} else if ("z" == axis_s) {
-			axis = Vector3::AXIS_Z;
-		} else {
-			return false;
-		}
-	}
-
-	String var_name = path.get_slicec('/', 2);
-
-	if ("linear_limit_enabled" == var_name) {
-		axis_data[axis].linear_limit_enabled = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_flag(j, axis, PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_LIMIT, axis_data[axis].linear_limit_enabled);
-		}
-
-	} else if ("linear_limit_upper" == var_name) {
-		axis_data[axis].linear_limit_upper = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_LINEAR_UPPER_LIMIT, axis_data[axis].linear_limit_upper);
-		}
-
-	} else if ("linear_limit_lower" == var_name) {
-		axis_data[axis].linear_limit_lower = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_LINEAR_LOWER_LIMIT, axis_data[axis].linear_limit_lower);
-		}
-
-	} else if ("linear_limit_softness" == var_name) {
-		axis_data[axis].linear_limit_softness = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_LINEAR_LIMIT_SOFTNESS, axis_data[axis].linear_limit_softness);
-		}
-
-	} else if ("linear_spring_enabled" == var_name) {
-		axis_data[axis].linear_spring_enabled = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_flag(j, axis, PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_SPRING, axis_data[axis].linear_spring_enabled);
-		}
-
-	} else if ("linear_spring_stiffness" == var_name) {
-		axis_data[axis].linear_spring_stiffness = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_STIFFNESS, axis_data[axis].linear_spring_stiffness);
-		}
-
-	} else if ("linear_spring_damping" == var_name) {
-		axis_data[axis].linear_spring_damping = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_DAMPING, axis_data[axis].linear_spring_damping);
-		}
-
-	} else if ("linear_equilibrium_point" == var_name) {
-		axis_data[axis].linear_equilibrium_point = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_EQUILIBRIUM_POINT, axis_data[axis].linear_equilibrium_point);
-		}
-
-	} else if ("linear_restitution" == var_name) {
-		axis_data[axis].linear_restitution = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_LINEAR_RESTITUTION, axis_data[axis].linear_restitution);
-		}
-
-	} else if ("linear_damping" == var_name) {
-		axis_data[axis].linear_damping = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_LINEAR_DAMPING, axis_data[axis].linear_damping);
-		}
-
-	} else if ("angular_limit_enabled" == var_name) {
-		axis_data[axis].angular_limit_enabled = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_flag(j, axis, PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_LIMIT, axis_data[axis].angular_limit_enabled);
-		}
-
-	} else if ("angular_limit_upper" == var_name) {
-		axis_data[axis].angular_limit_upper = Math::deg2rad(real_t(p_value));
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_UPPER_LIMIT, axis_data[axis].angular_limit_upper);
-		}
-
-	} else if ("angular_limit_lower" == var_name) {
-		axis_data[axis].angular_limit_lower = Math::deg2rad(real_t(p_value));
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_LOWER_LIMIT, axis_data[axis].angular_limit_lower);
-		}
-
-	} else if ("angular_limit_softness" == var_name) {
-		axis_data[axis].angular_limit_softness = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_LIMIT_SOFTNESS, axis_data[axis].angular_limit_softness);
-		}
-
-	} else if ("angular_restitution" == var_name) {
-		axis_data[axis].angular_restitution = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_RESTITUTION, axis_data[axis].angular_restitution);
-		}
-
-	} else if ("angular_damping" == var_name) {
-		axis_data[axis].angular_damping = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_DAMPING, axis_data[axis].angular_damping);
-		}
-
-	} else if ("erp" == var_name) {
-		axis_data[axis].erp = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_ERP, axis_data[axis].erp);
-		}
-
-	} else if ("angular_spring_enabled" == var_name) {
-		axis_data[axis].angular_spring_enabled = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_flag(j, axis, PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_SPRING, axis_data[axis].angular_spring_enabled);
-		}
-
-	} else if ("angular_spring_stiffness" == var_name) {
-		axis_data[axis].angular_spring_stiffness = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_STIFFNESS, axis_data[axis].angular_spring_stiffness);
-		}
-
-	} else if ("angular_spring_damping" == var_name) {
-		axis_data[axis].angular_spring_damping = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_DAMPING, axis_data[axis].angular_spring_damping);
-		}
-
-	} else if ("angular_equilibrium_point" == var_name) {
-		axis_data[axis].angular_equilibrium_point = p_value;
-		if (j.is_valid()) {
-			PhysicsServer::get_singleton()->generic_6dof_joint_set_param(j, axis, PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_EQUILIBRIUM_POINT, axis_data[axis].angular_equilibrium_point);
-		}
-
-	} else {
-		return false;
-	}
-
-	return true;
-}
-
-bool PhysicalBone::SixDOFJointData::_get(const StringName &p_name, Variant &r_ret) const {
-	if (JointData::_get(p_name, r_ret)) {
-		return true;
-	}
-
-	String path = p_name;
-
-	if (!path.begins_with("joint_constraints/")) {
-		return false;
-	}
-
-	int axis;
-	{
-		const String axis_s = path.get_slicec('/', 1);
-		if ("x" == axis_s) {
-			axis = 0;
-		} else if ("y" == axis_s) {
-			axis = 1;
-		} else if ("z" == axis_s) {
-			axis = 2;
-		} else {
-			return false;
-		}
-	}
-
-	String var_name = path.get_slicec('/', 2);
-
-	if ("linear_limit_enabled" == var_name) {
-		r_ret = axis_data[axis].linear_limit_enabled;
-	} else if ("linear_limit_upper" == var_name) {
-		r_ret = axis_data[axis].linear_limit_upper;
-	} else if ("linear_limit_lower" == var_name) {
-		r_ret = axis_data[axis].linear_limit_lower;
-	} else if ("linear_limit_softness" == var_name) {
-		r_ret = axis_data[axis].linear_limit_softness;
-	} else if ("linear_spring_enabled" == var_name) {
-		r_ret = axis_data[axis].linear_spring_enabled;
-	} else if ("linear_spring_stiffness" == var_name) {
-		r_ret = axis_data[axis].linear_spring_stiffness;
-	} else if ("linear_spring_damping" == var_name) {
-		r_ret = axis_data[axis].linear_spring_damping;
-	} else if ("linear_equilibrium_point" == var_name) {
-		r_ret = axis_data[axis].linear_equilibrium_point;
-	} else if ("linear_restitution" == var_name) {
-		r_ret = axis_data[axis].linear_restitution;
-	} else if ("linear_damping" == var_name) {
-		r_ret = axis_data[axis].linear_damping;
-	} else if ("angular_limit_enabled" == var_name) {
-		r_ret = axis_data[axis].angular_limit_enabled;
-	} else if ("angular_limit_upper" == var_name) {
-		r_ret = Math::rad2deg(axis_data[axis].angular_limit_upper);
-	} else if ("angular_limit_lower" == var_name) {
-		r_ret = Math::rad2deg(axis_data[axis].angular_limit_lower);
-	} else if ("angular_limit_softness" == var_name) {
-		r_ret = axis_data[axis].angular_limit_softness;
-	} else if ("angular_restitution" == var_name) {
-		r_ret = axis_data[axis].angular_restitution;
-	} else if ("angular_damping" == var_name) {
-		r_ret = axis_data[axis].angular_damping;
-	} else if ("erp" == var_name) {
-		r_ret = axis_data[axis].erp;
-	} else if ("angular_spring_enabled" == var_name) {
-		r_ret = axis_data[axis].angular_spring_enabled;
-	} else if ("angular_spring_stiffness" == var_name) {
-		r_ret = axis_data[axis].angular_spring_stiffness;
-	} else if ("angular_spring_damping" == var_name) {
-		r_ret = axis_data[axis].angular_spring_damping;
-	} else if ("angular_equilibrium_point" == var_name) {
-		r_ret = axis_data[axis].angular_equilibrium_point;
-	} else {
-		return false;
-	}
-
-	return true;
-}
-
-void PhysicalBone::SixDOFJointData::_get_property_list(List<PropertyInfo> *p_list) const {
-	const StringName axis_names[] = { "x", "y", "z" };
-	for (int i = 0; i < 3; ++i) {
-		p_list->push_back(PropertyInfo(Variant::BOOL, "joint_constraints/" + axis_names[i] + "/linear_limit_enabled"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/linear_limit_upper"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/linear_limit_lower"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/linear_limit_softness", PROPERTY_HINT_RANGE, "0.01,16,0.01"));
-		p_list->push_back(PropertyInfo(Variant::BOOL, "joint_constraints/" + axis_names[i] + "/linear_spring_enabled"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/linear_spring_stiffness"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/linear_spring_damping"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/linear_equilibrium_point"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/linear_restitution", PROPERTY_HINT_RANGE, "0.01,16,0.01"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/linear_damping", PROPERTY_HINT_RANGE, "0.01,16,0.01"));
-		p_list->push_back(PropertyInfo(Variant::BOOL, "joint_constraints/" + axis_names[i] + "/angular_limit_enabled"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/angular_limit_upper", PROPERTY_HINT_RANGE, "-180,180,0.01"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/angular_limit_lower", PROPERTY_HINT_RANGE, "-180,180,0.01"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/angular_limit_softness", PROPERTY_HINT_RANGE, "0.01,16,0.01"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/angular_restitution", PROPERTY_HINT_RANGE, "0.01,16,0.01"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/angular_damping", PROPERTY_HINT_RANGE, "0.01,16,0.01"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/erp"));
-		p_list->push_back(PropertyInfo(Variant::BOOL, "joint_constraints/" + axis_names[i] + "/angular_spring_enabled"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/angular_spring_stiffness"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/angular_spring_damping"));
-		p_list->push_back(PropertyInfo(Variant::REAL, "joint_constraints/" + axis_names[i] + "/angular_equilibrium_point"));
-	}
-}
-
-bool PhysicalBone::_set(const StringName &p_name, const Variant &p_value) {
-	if (p_name == "bone_name") {
-		set_bone_name(p_value);
-		return true;
-	}
-
-	if (joint_data) {
-		if (joint_data->_set(p_name, p_value, joint)) {
-#ifdef TOOLS_ENABLED
-			update_gizmos();
-#endif
-			return true;
-		}
-	}
-
-	return false;
-}
-
-bool PhysicalBone::_get(const StringName &p_name, Variant &r_ret) const {
-	if (p_name == "bone_name") {
-		r_ret = get_bone_name();
-		return true;
-	}
-
-	if (joint_data) {
-		return joint_data->_get(p_name, r_ret);
-	}
-
-	return false;
-}
-
-void PhysicalBone::_get_property_list(List<PropertyInfo> *p_list) const {
-	Skeleton *parent = find_skeleton_parent(get_parent());
-
-	if (parent) {
-		String names;
-		for (int i = 0; i < parent->get_bone_count(); i++) {
-			if (i > 0) {
-				names += ",";
-			}
-			names += parent->get_bone_name(i);
-		}
-
-		p_list->push_back(PropertyInfo(Variant::STRING_NAME, "bone_name", PROPERTY_HINT_ENUM, names));
-	} else {
-		p_list->push_back(PropertyInfo(Variant::STRING_NAME, "bone_name"));
-	}
-
-	if (joint_data) {
-		joint_data->_get_property_list(p_list);
-	}
-}
-
-void PhysicalBone::_notification(int p_what) {
-	switch (p_what) {
-		case NOTIFICATION_ENTER_TREE:
-			parent_skeleton = find_skeleton_parent(get_parent());
-			update_bone_id();
-			reset_to_rest_position();
-			reset_physics_simulation_state();
-			if (!joint.is_valid() && joint_data) {
-				_reload_joint();
-			}
-			break;
-		case NOTIFICATION_EXIT_TREE:
-			if (parent_skeleton) {
-				if (-1 != bone_id) {
-					parent_skeleton->unbind_physical_bone_from_bone(bone_id);
-					bone_id = -1;
-				}
-			}
-			parent_skeleton = nullptr;
-			if (joint.is_valid()) {
-				PhysicsServer::get_singleton()->free(joint);
-				joint = RID();
-			}
-			break;
-		case NOTIFICATION_TRANSFORM_CHANGED:
-			if (Engine::get_singleton()->is_editor_hint()) {
-				update_offset();
-			}
-			break;
-	}
-}
-
-void PhysicalBone::_direct_state_changed(Object *p_state) {
-	if (!simulate_physics || !_internal_simulate_physics) {
-		return;
-	}
-
-	/// Update bone transform
-
-	PhysicsDirectBodyState *state = Object::cast_to<PhysicsDirectBodyState>(p_state);
-	ERR_FAIL_COND_MSG(!state, "Method '_direct_state_changed' must receive a valid PhysicsDirectBodyState object as argument");
-
-	Transform global_transform(state->get_transform());
-
-	set_ignore_transform_notification(true);
-	set_global_transform(global_transform);
-	set_ignore_transform_notification(false);
-	_on_transform_changed();
-
-	// Update skeleton
-	if (parent_skeleton) {
-		if (-1 != bone_id) {
-			parent_skeleton->set_bone_global_pose_override(bone_id, parent_skeleton->get_global_transform().affine_inverse() * (global_transform * body_offset_inverse), 1.0, true);
-		}
-	}
-}
-
-void PhysicalBone::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("apply_central_impulse", "impulse"), &PhysicalBone::apply_central_impulse);
-	ClassDB::bind_method(D_METHOD("apply_impulse", "position", "impulse"), &PhysicalBone::apply_impulse);
-
-	ClassDB::bind_method(D_METHOD("_direct_state_changed"), &PhysicalBone::_direct_state_changed);
-
-	ClassDB::bind_method(D_METHOD("set_joint_type", "joint_type"), &PhysicalBone::set_joint_type);
-	ClassDB::bind_method(D_METHOD("get_joint_type"), &PhysicalBone::get_joint_type);
-
-	ClassDB::bind_method(D_METHOD("set_joint_offset", "offset"), &PhysicalBone::set_joint_offset);
-	ClassDB::bind_method(D_METHOD("get_joint_offset"), &PhysicalBone::get_joint_offset);
-
-	ClassDB::bind_method(D_METHOD("set_body_offset", "offset"), &PhysicalBone::set_body_offset);
-	ClassDB::bind_method(D_METHOD("get_body_offset"), &PhysicalBone::get_body_offset);
-
-	ClassDB::bind_method(D_METHOD("get_simulate_physics"), &PhysicalBone::get_simulate_physics);
-
-	ClassDB::bind_method(D_METHOD("is_simulating_physics"), &PhysicalBone::is_simulating_physics);
-
-	ClassDB::bind_method(D_METHOD("get_bone_id"), &PhysicalBone::get_bone_id);
-
-	ClassDB::bind_method(D_METHOD("set_mass", "mass"), &PhysicalBone::set_mass);
-	ClassDB::bind_method(D_METHOD("get_mass"), &PhysicalBone::get_mass);
-
-	ClassDB::bind_method(D_METHOD("set_weight", "weight"), &PhysicalBone::set_weight);
-	ClassDB::bind_method(D_METHOD("get_weight"), &PhysicalBone::get_weight);
-
-	ClassDB::bind_method(D_METHOD("set_friction", "friction"), &PhysicalBone::set_friction);
-	ClassDB::bind_method(D_METHOD("get_friction"), &PhysicalBone::get_friction);
-
-	ClassDB::bind_method(D_METHOD("set_bounce", "bounce"), &PhysicalBone::set_bounce);
-	ClassDB::bind_method(D_METHOD("get_bounce"), &PhysicalBone::get_bounce);
-
-	ClassDB::bind_method(D_METHOD("set_gravity_scale", "gravity_scale"), &PhysicalBone::set_gravity_scale);
-	ClassDB::bind_method(D_METHOD("get_gravity_scale"), &PhysicalBone::get_gravity_scale);
-
-	ADD_GROUP("Joint", "joint_");
-	ADD_PROPERTY(PropertyInfo(Variant::INT, "joint_type", PROPERTY_HINT_ENUM, "None,PinJoint,ConeJoint,HingeJoint,SliderJoint,6DOFJoint"), "set_joint_type", "get_joint_type");
-	ADD_PROPERTY(PropertyInfo(Variant::TRANSFORM, "joint_offset"), "set_joint_offset", "get_joint_offset");
-
-	ADD_PROPERTY(PropertyInfo(Variant::TRANSFORM, "body_offset"), "set_body_offset", "get_body_offset");
-
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "mass", PROPERTY_HINT_EXP_RANGE, "0.01,65535,0.01"), "set_mass", "get_mass");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "weight", PROPERTY_HINT_EXP_RANGE, "0.01,65535,0.01"), "set_weight", "get_weight");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "friction", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_friction", "get_friction");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "bounce", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_bounce", "get_bounce");
-	ADD_PROPERTY(PropertyInfo(Variant::REAL, "gravity_scale", PROPERTY_HINT_RANGE, "-10,10,0.01"), "set_gravity_scale", "get_gravity_scale");
-
-	BIND_ENUM_CONSTANT(JOINT_TYPE_NONE);
-	BIND_ENUM_CONSTANT(JOINT_TYPE_PIN);
-	BIND_ENUM_CONSTANT(JOINT_TYPE_CONE);
-	BIND_ENUM_CONSTANT(JOINT_TYPE_HINGE);
-	BIND_ENUM_CONSTANT(JOINT_TYPE_SLIDER);
-	BIND_ENUM_CONSTANT(JOINT_TYPE_6DOF);
-}
-
-Skeleton *PhysicalBone::find_skeleton_parent(Node *p_parent) {
-	if (!p_parent) {
-		return nullptr;
-	}
-	Skeleton *s = Object::cast_to<Skeleton>(p_parent);
-	return s ? s : find_skeleton_parent(p_parent->get_parent());
-}
-
-void PhysicalBone::_fix_joint_offset() {
-	// Clamp joint origin to bone origin
-	if (parent_skeleton) {
-		joint_offset.origin = body_offset.affine_inverse().origin;
-	}
-}
-
-void PhysicalBone::_reload_joint() {
-	if (joint.is_valid()) {
-		PhysicsServer::get_singleton()->free(joint);
-		joint = RID();
-	}
-
-	if (!parent_skeleton) {
-		return;
-	}
-
-	PhysicalBone *body_a = parent_skeleton->get_physical_bone_parent(bone_id);
-	if (!body_a) {
-		return;
-	}
-
-	Transform joint_transf = get_global_transform() * joint_offset;
-	Transform local_a = body_a->get_global_transform().affine_inverse() * joint_transf;
-	local_a.orthonormalize();
-
-	switch (get_joint_type()) {
-		case JOINT_TYPE_PIN: {
-			joint = RID_PRIME(PhysicsServer::get_singleton()->joint_create_pin(body_a->get_rid(), local_a.origin, get_rid(), joint_offset.origin));
-			const PinJointData *pjd(static_cast<const PinJointData *>(joint_data));
-			PhysicsServer::get_singleton()->pin_joint_set_param(joint, PhysicsServer::PIN_JOINT_BIAS, pjd->bias);
-			PhysicsServer::get_singleton()->pin_joint_set_param(joint, PhysicsServer::PIN_JOINT_DAMPING, pjd->damping);
-			PhysicsServer::get_singleton()->pin_joint_set_param(joint, PhysicsServer::PIN_JOINT_IMPULSE_CLAMP, pjd->impulse_clamp);
-
-		} break;
-		case JOINT_TYPE_CONE: {
-			joint = RID_PRIME(PhysicsServer::get_singleton()->joint_create_cone_twist(body_a->get_rid(), local_a, get_rid(), joint_offset));
-			const ConeJointData *cjd(static_cast<const ConeJointData *>(joint_data));
-			PhysicsServer::get_singleton()->cone_twist_joint_set_param(joint, PhysicsServer::CONE_TWIST_JOINT_SWING_SPAN, cjd->swing_span);
-			PhysicsServer::get_singleton()->cone_twist_joint_set_param(joint, PhysicsServer::CONE_TWIST_JOINT_TWIST_SPAN, cjd->twist_span);
-			PhysicsServer::get_singleton()->cone_twist_joint_set_param(joint, PhysicsServer::CONE_TWIST_JOINT_BIAS, cjd->bias);
-			PhysicsServer::get_singleton()->cone_twist_joint_set_param(joint, PhysicsServer::CONE_TWIST_JOINT_SOFTNESS, cjd->softness);
-			PhysicsServer::get_singleton()->cone_twist_joint_set_param(joint, PhysicsServer::CONE_TWIST_JOINT_RELAXATION, cjd->relaxation);
-
-		} break;
-		case JOINT_TYPE_HINGE: {
-			joint = RID_PRIME(PhysicsServer::get_singleton()->joint_create_hinge(body_a->get_rid(), local_a, get_rid(), joint_offset));
-			const HingeJointData *hjd(static_cast<const HingeJointData *>(joint_data));
-			PhysicsServer::get_singleton()->hinge_joint_set_flag(joint, PhysicsServer::HINGE_JOINT_FLAG_USE_LIMIT, hjd->angular_limit_enabled);
-			PhysicsServer::get_singleton()->hinge_joint_set_param(joint, PhysicsServer::HINGE_JOINT_LIMIT_UPPER, hjd->angular_limit_upper);
-			PhysicsServer::get_singleton()->hinge_joint_set_param(joint, PhysicsServer::HINGE_JOINT_LIMIT_LOWER, hjd->angular_limit_lower);
-			PhysicsServer::get_singleton()->hinge_joint_set_param(joint, PhysicsServer::HINGE_JOINT_LIMIT_BIAS, hjd->angular_limit_bias);
-			PhysicsServer::get_singleton()->hinge_joint_set_param(joint, PhysicsServer::HINGE_JOINT_LIMIT_SOFTNESS, hjd->angular_limit_softness);
-			PhysicsServer::get_singleton()->hinge_joint_set_param(joint, PhysicsServer::HINGE_JOINT_LIMIT_RELAXATION, hjd->angular_limit_relaxation);
-
-		} break;
-		case JOINT_TYPE_SLIDER: {
-			joint = RID_PRIME(PhysicsServer::get_singleton()->joint_create_slider(body_a->get_rid(), local_a, get_rid(), joint_offset));
-			const SliderJointData *sjd(static_cast<const SliderJointData *>(joint_data));
-			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_UPPER, sjd->linear_limit_upper);
-			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_LOWER, sjd->linear_limit_lower);
-			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_SOFTNESS, sjd->linear_limit_softness);
-			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_RESTITUTION, sjd->linear_limit_restitution);
-			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_LINEAR_LIMIT_DAMPING, sjd->linear_limit_restitution);
-			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_UPPER, sjd->angular_limit_upper);
-			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_LOWER, sjd->angular_limit_lower);
-			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_SOFTNESS, sjd->angular_limit_softness);
-			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_SOFTNESS, sjd->angular_limit_softness);
-			PhysicsServer::get_singleton()->slider_joint_set_param(joint, PhysicsServer::SLIDER_JOINT_ANGULAR_LIMIT_DAMPING, sjd->angular_limit_damping);
-
-		} break;
-		case JOINT_TYPE_6DOF: {
-			joint = RID_PRIME(PhysicsServer::get_singleton()->joint_create_generic_6dof(body_a->get_rid(), local_a, get_rid(), joint_offset));
-			const SixDOFJointData *g6dofjd(static_cast<const SixDOFJointData *>(joint_data));
-			for (int axis = 0; axis < 3; ++axis) {
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_flag(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_LIMIT, g6dofjd->axis_data[axis].linear_limit_enabled);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_LINEAR_UPPER_LIMIT, g6dofjd->axis_data[axis].linear_limit_upper);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_LINEAR_LOWER_LIMIT, g6dofjd->axis_data[axis].linear_limit_lower);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_LINEAR_LIMIT_SOFTNESS, g6dofjd->axis_data[axis].linear_limit_softness);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_flag(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_LINEAR_SPRING, g6dofjd->axis_data[axis].linear_spring_enabled);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_STIFFNESS, g6dofjd->axis_data[axis].linear_spring_stiffness);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_DAMPING, g6dofjd->axis_data[axis].linear_spring_damping);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_LINEAR_SPRING_EQUILIBRIUM_POINT, g6dofjd->axis_data[axis].linear_equilibrium_point);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_LINEAR_RESTITUTION, g6dofjd->axis_data[axis].linear_restitution);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_LINEAR_DAMPING, g6dofjd->axis_data[axis].linear_damping);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_flag(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_LIMIT, g6dofjd->axis_data[axis].angular_limit_enabled);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_UPPER_LIMIT, g6dofjd->axis_data[axis].angular_limit_upper);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_LOWER_LIMIT, g6dofjd->axis_data[axis].angular_limit_lower);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_LIMIT_SOFTNESS, g6dofjd->axis_data[axis].angular_limit_softness);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_RESTITUTION, g6dofjd->axis_data[axis].angular_restitution);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_DAMPING, g6dofjd->axis_data[axis].angular_damping);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_ERP, g6dofjd->axis_data[axis].erp);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_flag(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_FLAG_ENABLE_ANGULAR_SPRING, g6dofjd->axis_data[axis].angular_spring_enabled);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_STIFFNESS, g6dofjd->axis_data[axis].angular_spring_stiffness);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_DAMPING, g6dofjd->axis_data[axis].angular_spring_damping);
-				PhysicsServer::get_singleton()->generic_6dof_joint_set_param(joint, static_cast<Vector3::Axis>(axis), PhysicsServer::G6DOF_JOINT_ANGULAR_SPRING_EQUILIBRIUM_POINT, g6dofjd->axis_data[axis].angular_equilibrium_point);
-			}
-
-		} break;
-		case JOINT_TYPE_NONE: {
-		} break;
-	}
-}
-
-void PhysicalBone::_on_bone_parent_changed() {
-	_reload_joint();
-}
-
-void PhysicalBone::_set_gizmo_move_joint(bool p_move_joint) {
-#ifdef TOOLS_ENABLED
-	gizmo_move_joint = p_move_joint;
-	SpatialEditor::get_singleton()->update_transform_gizmo();
-#endif
-}
-
-#ifdef TOOLS_ENABLED
-Transform PhysicalBone::get_global_gizmo_transform() const {
-	return gizmo_move_joint ? get_global_transform() * joint_offset : get_global_transform();
-}
-
-Transform PhysicalBone::get_local_gizmo_transform() const {
-	return gizmo_move_joint ? get_transform() * joint_offset : get_transform();
-}
-#endif
-
-const PhysicalBone::JointData *PhysicalBone::get_joint_data() const {
-	return joint_data;
-}
-
-Skeleton *PhysicalBone::find_skeleton_parent() {
-	return find_skeleton_parent(this);
-}
-
-void PhysicalBone::set_joint_type(JointType p_joint_type) {
-	if (p_joint_type == get_joint_type()) {
-		return;
-	}
-
-	if (joint_data) {
-		memdelete(joint_data);
-	}
-	joint_data = nullptr;
-	switch (p_joint_type) {
-		case JOINT_TYPE_PIN:
-			joint_data = memnew(PinJointData);
-			break;
-		case JOINT_TYPE_CONE:
-			joint_data = memnew(ConeJointData);
-			break;
-		case JOINT_TYPE_HINGE:
-			joint_data = memnew(HingeJointData);
-			break;
-		case JOINT_TYPE_SLIDER:
-			joint_data = memnew(SliderJointData);
-			break;
-		case JOINT_TYPE_6DOF:
-			joint_data = memnew(SixDOFJointData);
-			break;
-		case JOINT_TYPE_NONE:
-			break;
-	}
-
-	_reload_joint();
-
-#ifdef TOOLS_ENABLED
-	_change_notify();
-	update_gizmos();
-#endif
-}
-
-PhysicalBone::JointType PhysicalBone::get_joint_type() const {
-	return joint_data ? joint_data->get_joint_type() : JOINT_TYPE_NONE;
-}
-
-void PhysicalBone::set_joint_offset(const Transform &p_offset) {
-	joint_offset = p_offset;
-
-	_fix_joint_offset();
-
-	set_ignore_transform_notification(true);
-	reset_to_rest_position();
-	set_ignore_transform_notification(false);
-
-#ifdef TOOLS_ENABLED
-	update_gizmos();
-#endif
-}
-
-const Transform &PhysicalBone::get_body_offset() const {
-	return body_offset;
-}
-
-void PhysicalBone::set_body_offset(const Transform &p_offset) {
-	body_offset = p_offset;
-	body_offset_inverse = body_offset.affine_inverse();
-
-	_fix_joint_offset();
-
-	set_ignore_transform_notification(true);
-	reset_to_rest_position();
-	set_ignore_transform_notification(false);
-
-#ifdef TOOLS_ENABLED
-	update_gizmos();
-#endif
-}
-
-const Transform &PhysicalBone::get_joint_offset() const {
-	return joint_offset;
-}
-
-void PhysicalBone::set_simulate_physics(bool p_simulate) {
-	if (simulate_physics == p_simulate) {
-		return;
-	}
-
-	simulate_physics = p_simulate;
-	reset_physics_simulation_state();
-}
-
-bool PhysicalBone::get_simulate_physics() {
-	return simulate_physics;
-}
-
-bool PhysicalBone::is_simulating_physics() {
-	return _internal_simulate_physics;
-}
-
-void PhysicalBone::set_bone_name(const String &p_name) {
-	bone_name = p_name;
-	bone_id = -1;
-
-	update_bone_id();
-	reset_to_rest_position();
-}
-
-const String &PhysicalBone::get_bone_name() const {
-	return bone_name;
-}
-
-void PhysicalBone::set_mass(real_t p_mass) {
-	ERR_FAIL_COND(p_mass <= 0);
-	mass = p_mass;
-	PhysicsServer::get_singleton()->body_set_param(get_rid(), PhysicsServer::BODY_PARAM_MASS, mass);
-}
-
-real_t PhysicalBone::get_mass() const {
-	return mass;
-}
-
-void PhysicalBone::set_weight(real_t p_weight) {
-	set_mass(p_weight / real_t(GLOBAL_DEF("physics/3d/default_gravity", 9.8)));
-}
-
-real_t PhysicalBone::get_weight() const {
-	return mass * real_t(GLOBAL_DEF("physics/3d/default_gravity", 9.8));
-}
-
-void PhysicalBone::set_friction(real_t p_friction) {
-	ERR_FAIL_COND(p_friction < 0 || p_friction > 1);
-
-	friction = p_friction;
-	PhysicsServer::get_singleton()->body_set_param(get_rid(), PhysicsServer::BODY_PARAM_FRICTION, friction);
-}
-
-real_t PhysicalBone::get_friction() const {
-	return friction;
-}
-
-void PhysicalBone::set_bounce(real_t p_bounce) {
-	ERR_FAIL_COND(p_bounce < 0 || p_bounce > 1);
-
-	bounce = p_bounce;
-	PhysicsServer::get_singleton()->body_set_param(get_rid(), PhysicsServer::BODY_PARAM_BOUNCE, bounce);
-}
-
-real_t PhysicalBone::get_bounce() const {
-	return bounce;
-}
-
-void PhysicalBone::set_gravity_scale(real_t p_gravity_scale) {
-	gravity_scale = p_gravity_scale;
-	PhysicsServer::get_singleton()->body_set_param(get_rid(), PhysicsServer::BODY_PARAM_GRAVITY_SCALE, gravity_scale);
-}
-
-real_t PhysicalBone::get_gravity_scale() const {
-	return gravity_scale;
-}
-
-PhysicalBone::PhysicalBone() :
-		PhysicsBody(PhysicsServer::BODY_MODE_STATIC),
-#ifdef TOOLS_ENABLED
-		gizmo_move_joint(false),
-#endif
-		joint_data(nullptr),
-		parent_skeleton(nullptr),
-		simulate_physics(false),
-		_internal_simulate_physics(false),
-		bone_id(-1),
-		bone_name(""),
-		bounce(0),
-		mass(1),
-		friction(1),
-		gravity_scale(1) {
-
-	reset_physics_simulation_state();
-}
-
-PhysicalBone::~PhysicalBone() {
-	if (joint_data) {
-		memdelete(joint_data);
-	}
-}
-
-void PhysicalBone::update_bone_id() {
-	if (!parent_skeleton) {
-		return;
-	}
-
-	const int new_bone_id = parent_skeleton->find_bone(bone_name);
-
-	if (new_bone_id != bone_id) {
-		if (-1 != bone_id) {
-			// Assert the unbind from old node
-			parent_skeleton->unbind_physical_bone_from_bone(bone_id);
-		}
-
-		bone_id = new_bone_id;
-
-		parent_skeleton->bind_physical_bone_to_bone(bone_id, this);
-
-		_fix_joint_offset();
-		reset_physics_simulation_state();
-	}
-}
-
-void PhysicalBone::update_offset() {
-#ifdef TOOLS_ENABLED
-	if (parent_skeleton) {
-		Transform bone_transform(parent_skeleton->get_global_transform());
-		if (-1 != bone_id) {
-			bone_transform *= parent_skeleton->get_bone_global_pose(bone_id);
-		}
-
-		if (gizmo_move_joint) {
-			bone_transform *= body_offset;
-			set_joint_offset(bone_transform.affine_inverse() * get_global_transform());
-		} else {
-			set_body_offset(bone_transform.affine_inverse() * get_global_transform());
-		}
-	}
-#endif
-}
-
-void PhysicalBone::_start_physics_simulation() {
-	if (_internal_simulate_physics || !parent_skeleton) {
-		return;
-	}
-	reset_to_rest_position();
-	PhysicsServer::get_singleton()->body_set_mode(get_rid(), PhysicsServer::BODY_MODE_RIGID);
-	PhysicsServer::get_singleton()->body_set_collision_layer(get_rid(), get_collision_layer());
-	PhysicsServer::get_singleton()->body_set_collision_mask(get_rid(), get_collision_mask());
-	PhysicsServer::get_singleton()->body_set_force_integration_callback(get_rid(), this, "_direct_state_changed");
-	set_as_toplevel(true);
-	_internal_simulate_physics = true;
-}
-
-void PhysicalBone::_stop_physics_simulation() {
-	if (!parent_skeleton) {
-		return;
-	}
-
-	if (parent_skeleton->get_animate_physical_bones()) {
-		PhysicsServer::get_singleton()->body_set_mode(get_rid(), PhysicsServer::BODY_MODE_KINEMATIC);
-		PhysicsServer::get_singleton()->body_set_collision_layer(get_rid(), get_collision_layer());
-		PhysicsServer::get_singleton()->body_set_collision_mask(get_rid(), get_collision_mask());
-	} else {
-		PhysicsServer::get_singleton()->body_set_mode(get_rid(), PhysicsServer::BODY_MODE_STATIC);
-		PhysicsServer::get_singleton()->body_set_collision_layer(get_rid(), 0);
-		PhysicsServer::get_singleton()->body_set_collision_mask(get_rid(), 0);
-	}
-	if (_internal_simulate_physics) {
-		PhysicsServer::get_singleton()->body_set_force_integration_callback(get_rid(), NULL, "");
-		parent_skeleton->set_bone_global_pose_override(bone_id, Transform(), 0.0, false);
-		set_as_toplevel(false);
-		_internal_simulate_physics = false;
-	}
-}
diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h
index 5e6b6cb00..034b91fdf 100644
--- a/scene/3d/physics_body.h
+++ b/scene/3d/physics_body.h
@@ -30,8 +30,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/object/reference.h"
 #include "core/containers/vset.h"
+#include "core/object/reference.h"
 #include "scene/3d/collision_object.h"
 #include "servers/physics_server.h"
 
@@ -383,282 +383,4 @@ public:
 	~KinematicCollision();
 };
 
-class PhysicalBone : public PhysicsBody {
-	GDCLASS(PhysicalBone, PhysicsBody);
-
-public:
-	enum JointType {
-		JOINT_TYPE_NONE,
-		JOINT_TYPE_PIN,
-		JOINT_TYPE_CONE,
-		JOINT_TYPE_HINGE,
-		JOINT_TYPE_SLIDER,
-		JOINT_TYPE_6DOF
-	};
-
-	struct JointData {
-		virtual JointType get_joint_type() { return JOINT_TYPE_NONE; }
-
-		/// "j" is used to set the parameter inside the PhysicsServer
-		virtual bool _set(const StringName &p_name, const Variant &p_value, RID j);
-		virtual bool _get(const StringName &p_name, Variant &r_ret) const;
-		virtual void _get_property_list(List<PropertyInfo> *p_list) const;
-
-		virtual ~JointData() {}
-	};
-
-	struct PinJointData : public JointData {
-		virtual JointType get_joint_type() { return JOINT_TYPE_PIN; }
-
-		virtual bool _set(const StringName &p_name, const Variant &p_value, RID j);
-		virtual bool _get(const StringName &p_name, Variant &r_ret) const;
-		virtual void _get_property_list(List<PropertyInfo> *p_list) const;
-
-		real_t bias;
-		real_t damping;
-		real_t impulse_clamp;
-
-		PinJointData() :
-				bias(0.3),
-				damping(1.),
-				impulse_clamp(0) {}
-	};
-
-	struct ConeJointData : public JointData {
-		virtual JointType get_joint_type() { return JOINT_TYPE_CONE; }
-
-		virtual bool _set(const StringName &p_name, const Variant &p_value, RID j);
-		virtual bool _get(const StringName &p_name, Variant &r_ret) const;
-		virtual void _get_property_list(List<PropertyInfo> *p_list) const;
-
-		real_t swing_span;
-		real_t twist_span;
-		real_t bias;
-		real_t softness;
-		real_t relaxation;
-
-		ConeJointData() :
-				swing_span(Math_PI * 0.25),
-				twist_span(Math_PI),
-				bias(0.3),
-				softness(0.8),
-				relaxation(1.) {}
-	};
-
-	struct HingeJointData : public JointData {
-		virtual JointType get_joint_type() { return JOINT_TYPE_HINGE; }
-
-		virtual bool _set(const StringName &p_name, const Variant &p_value, RID j);
-		virtual bool _get(const StringName &p_name, Variant &r_ret) const;
-		virtual void _get_property_list(List<PropertyInfo> *p_list) const;
-
-		bool angular_limit_enabled;
-		real_t angular_limit_upper;
-		real_t angular_limit_lower;
-		real_t angular_limit_bias;
-		real_t angular_limit_softness;
-		real_t angular_limit_relaxation;
-
-		HingeJointData() :
-				angular_limit_enabled(false),
-				angular_limit_upper(Math_PI * 0.5),
-				angular_limit_lower(-Math_PI * 0.5),
-				angular_limit_bias(0.3),
-				angular_limit_softness(0.9),
-				angular_limit_relaxation(1.) {}
-	};
-
-	struct SliderJointData : public JointData {
-		virtual JointType get_joint_type() { return JOINT_TYPE_SLIDER; }
-
-		virtual bool _set(const StringName &p_name, const Variant &p_value, RID j);
-		virtual bool _get(const StringName &p_name, Variant &r_ret) const;
-		virtual void _get_property_list(List<PropertyInfo> *p_list) const;
-
-		real_t linear_limit_upper;
-		real_t linear_limit_lower;
-		real_t linear_limit_softness;
-		real_t linear_limit_restitution;
-		real_t linear_limit_damping;
-		real_t angular_limit_upper;
-		real_t angular_limit_lower;
-		real_t angular_limit_softness;
-		real_t angular_limit_restitution;
-		real_t angular_limit_damping;
-
-		SliderJointData() :
-				linear_limit_upper(1.),
-				linear_limit_lower(-1.),
-				linear_limit_softness(1.),
-				linear_limit_restitution(0.7),
-				linear_limit_damping(1.),
-				angular_limit_upper(0),
-				angular_limit_lower(0),
-				angular_limit_softness(1.),
-				angular_limit_restitution(0.7),
-				angular_limit_damping(1.) {}
-	};
-
-	struct SixDOFJointData : public JointData {
-		struct SixDOFAxisData {
-			bool linear_limit_enabled;
-			real_t linear_limit_upper;
-			real_t linear_limit_lower;
-			real_t linear_limit_softness;
-			real_t linear_restitution;
-			real_t linear_damping;
-			bool linear_spring_enabled;
-			real_t linear_spring_stiffness;
-			real_t linear_spring_damping;
-			real_t linear_equilibrium_point;
-			bool angular_limit_enabled;
-			real_t angular_limit_upper;
-			real_t angular_limit_lower;
-			real_t angular_limit_softness;
-			real_t angular_restitution;
-			real_t angular_damping;
-			real_t erp;
-			bool angular_spring_enabled;
-			real_t angular_spring_stiffness;
-			real_t angular_spring_damping;
-			real_t angular_equilibrium_point;
-
-			SixDOFAxisData() :
-					linear_limit_enabled(true),
-					linear_limit_upper(0),
-					linear_limit_lower(0),
-					linear_limit_softness(0.7),
-					linear_restitution(0.5),
-					linear_damping(1.),
-					linear_spring_enabled(false),
-					linear_spring_stiffness(0),
-					linear_spring_damping(0),
-					linear_equilibrium_point(0),
-					angular_limit_enabled(true),
-					angular_limit_upper(0),
-					angular_limit_lower(0),
-					angular_limit_softness(0.5),
-					angular_restitution(0),
-					angular_damping(1.),
-					erp(0.5),
-					angular_spring_enabled(false),
-					angular_spring_stiffness(0),
-					angular_spring_damping(0.),
-					angular_equilibrium_point(0) {}
-		};
-
-		virtual JointType get_joint_type() { return JOINT_TYPE_6DOF; }
-
-		virtual bool _set(const StringName &p_name, const Variant &p_value, RID j);
-		virtual bool _get(const StringName &p_name, Variant &r_ret) const;
-		virtual void _get_property_list(List<PropertyInfo> *p_list) const;
-
-		SixDOFAxisData axis_data[3];
-
-		SixDOFJointData() {}
-	};
-
-private:
-#ifdef TOOLS_ENABLED
-	// if false gizmo move body
-	bool gizmo_move_joint;
-#endif
-
-	JointData *joint_data;
-	Transform joint_offset;
-	RID joint;
-
-	Skeleton *parent_skeleton;
-	Transform body_offset;
-	Transform body_offset_inverse;
-	bool simulate_physics;
-	bool _internal_simulate_physics;
-	int bone_id;
-
-	String bone_name;
-	real_t bounce;
-	real_t mass;
-	real_t friction;
-	real_t gravity_scale;
-
-protected:
-	bool _set(const StringName &p_name, const Variant &p_value);
-	bool _get(const StringName &p_name, Variant &r_ret) const;
-	void _get_property_list(List<PropertyInfo> *p_list) const;
-	void _notification(int p_what);
-	void _direct_state_changed(Object *p_state);
-
-	static void _bind_methods();
-
-private:
-	static Skeleton *find_skeleton_parent(Node *p_parent);
-
-	void _fix_joint_offset();
-	void _reload_joint();
-
-public:
-	void _on_bone_parent_changed();
-	void _set_gizmo_move_joint(bool p_move_joint);
-
-public:
-#ifdef TOOLS_ENABLED
-	virtual Transform get_global_gizmo_transform() const;
-	virtual Transform get_local_gizmo_transform() const;
-#endif
-
-	const JointData *get_joint_data() const;
-	Skeleton *find_skeleton_parent();
-
-	int get_bone_id() const { return bone_id; }
-
-	void set_joint_type(JointType p_joint_type);
-	JointType get_joint_type() const;
-
-	void set_joint_offset(const Transform &p_offset);
-	const Transform &get_joint_offset() const;
-
-	void set_body_offset(const Transform &p_offset);
-	const Transform &get_body_offset() const;
-
-	void set_simulate_physics(bool p_simulate);
-	bool get_simulate_physics();
-	bool is_simulating_physics();
-
-	void set_bone_name(const String &p_name);
-	const String &get_bone_name() const;
-
-	void set_mass(real_t p_mass);
-	real_t get_mass() const;
-
-	void set_weight(real_t p_weight);
-	real_t get_weight() const;
-
-	void set_friction(real_t p_friction);
-	real_t get_friction() const;
-
-	void set_bounce(real_t p_bounce);
-	real_t get_bounce() const;
-
-	void set_gravity_scale(real_t p_gravity_scale);
-	real_t get_gravity_scale() const;
-
-	void apply_central_impulse(const Vector3 &p_impulse);
-	void apply_impulse(const Vector3 &p_pos, const Vector3 &p_impulse);
-
-	void reset_physics_simulation_state();
-	void reset_to_rest_position();
-
-	PhysicalBone();
-	~PhysicalBone();
-
-private:
-	void update_bone_id();
-	void update_offset();
-
-	void _start_physics_simulation();
-	void _stop_physics_simulation();
-};
-
-VARIANT_ENUM_CAST(PhysicalBone::JointType);
-
 #endif // PHYSICS_BODY__H
diff --git a/scene/3d/soft_body.cpp b/scene/3d/soft_body.cpp
index fc41f2ee3..a13333361 100644
--- a/scene/3d/soft_body.cpp
+++ b/scene/3d/soft_body.cpp
@@ -35,7 +35,6 @@
 #include "core/containers/rid.h"
 #include "scene/3d/collision_object.h"
 #include "scene/3d/physics_body.h"
-#include "scene/3d/skeleton.h"
 #include "scene/resources/mesh.h"
 #include "scene/resources/world.h"
 #include "servers/physics_server.h"
diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp
index 3c30bdada..767324a70 100644
--- a/scene/3d/visual_instance.cpp
+++ b/scene/3d/visual_instance.cpp
@@ -34,7 +34,7 @@
 #include "scene/resources/world.h"
 #include "scene/scene_string_names.h"
 #include "servers/rendering_server.h"
-#include "skeleton.h"
+//#include "skeleton.h"
 
 AABB VisualInstance::get_transformed_aabb() const {
 	return get_global_transform().xform(get_aabb());
diff --git a/scene/animation/animation_blend_space_1d.cpp b/scene/animation/animation_blend_space_1d.cpp
index 1f15f7410..b94171292 100644
--- a/scene/animation/animation_blend_space_1d.cpp
+++ b/scene/animation/animation_blend_space_1d.cpp
@@ -30,8 +30,6 @@
 
 #include "animation_blend_space_1d.h"
 
-#include "scene/3d/skeleton.h"
-
 void AnimationNodeBlendSpace1D::get_parameter_list(List<PropertyInfo> *r_list) const {
 	r_list->push_back(PropertyInfo(Variant::REAL, blend_position));
 }
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp
index 632b43ab8..8cd3fbee9 100644
--- a/scene/animation/animation_player.cpp
+++ b/scene/animation/animation_player.cpp
@@ -33,7 +33,6 @@
 #include "core/config/engine.h"
 #include "core/object/message_queue.h"
 #include "scene/2d/node_2d.h"
-#include "scene/3d/skeleton.h"
 #include "scene/3d/spatial.h"
 #include "scene/resources/animation.h"
 #include "scene/scene_string_names.h"
@@ -43,17 +42,21 @@
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 
-#include "modules/modules_enabled.gen.h"
-
 #ifdef MODULE_SKELETON_2D_ENABLED
 #include "modules/skeleton_2d/nodes/skeleton_2d.h"
 #endif
 
+#ifdef MODULE_SKELETON_3D_ENABLED
+#include "modules/skeleton_3d/nodes/skeleton.h"
+#endif
+
 void AnimatedValuesBackup::update_skeletons() {
 	for (int i = 0; i < entries.size(); i++) {
 		if (entries[i].bone_idx != -1) {
+#ifdef MODULE_SKELETON_3D_ENABLED
 			// 3D bone
 			Object::cast_to<Skeleton>(entries[i].object)->notification(Skeleton::NOTIFICATION_UPDATE_SKELETON);
+#endif
 		} else {
 #ifdef MODULE_SKELETON_2D_ENABLED
 			Bone2D *bone = Object::cast_to<Bone2D>(entries[i].object);
@@ -71,7 +74,9 @@ void AnimatedValuesBackup::restore() const {
 		const AnimatedValuesBackup::Entry *entry = &entries[i];
 		if (entry->bone_idx == -1) {
 			entry->object->set_indexed(entry->subpath, entry->value);
-		} else {
+		}
+#ifdef MODULE_SKELETON_3D_ENABLED
+		else {
 			Array arr = entry->value;
 			if (arr.size() == 3) {
 				Object::cast_to<Skeleton>(entry->object)->set_bone_pose_position(entry->bone_idx, arr[0]);
@@ -79,6 +84,7 @@ void AnimatedValuesBackup::restore() const {
 				Object::cast_to<Skeleton>(entry->object)->set_bone_pose_scale(entry->bone_idx, arr[2]);
 			}
 		}
+#endif
 	}
 }
 
@@ -275,6 +281,7 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim, Node *p_root_ov
 		uint32_t id = resource.is_valid() ? resource->get_instance_id() : child->get_instance_id();
 		int bone_idx = -1;
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 		if (a->track_get_path(i).get_subname_count() == 1 && Object::cast_to<Skeleton>(child)) {
 			Skeleton *sk = Object::cast_to<Skeleton>(child);
 			bone_idx = sk->find_bone(a->track_get_path(i).get_subname(0));
@@ -282,6 +289,7 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim, Node *p_root_ov
 				continue;
 			}
 		}
+#endif
 
 		{
 			if (!child->is_connected("tree_exiting", this, "_node_removed")) {
@@ -317,6 +325,8 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim, Node *p_root_ov
 
 			// cache spatial
 			node_cache->spatial = Object::cast_to<Spatial>(child);
+
+#ifdef MODULE_SKELETON_3D_ENABLED
 			// cache skeleton
 			node_cache->skeleton = Object::cast_to<Skeleton>(child);
 			if (node_cache->skeleton) {
@@ -339,6 +349,7 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim, Node *p_root_ov
 					node_cache->skeleton = nullptr;
 				}
 			}
+#endif
 
 			switch (a->track_get_type(i)) {
 				case Animation::TYPE_POSITION_3D: {
@@ -958,6 +969,7 @@ void AnimationPlayer::_animation_update_transforms() {
 
 #ifndef _3D_DISABLED
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 			if (nc->skeleton && nc->bone_idx >= 0) {
 				if (nc->loc_used) {
 					nc->skeleton->set_bone_pose_position(nc->bone_idx, nc->loc_accum);
@@ -969,7 +981,9 @@ void AnimationPlayer::_animation_update_transforms() {
 					nc->skeleton->set_bone_pose_scale(nc->bone_idx, nc->scale_accum);
 				}
 
-			} else if (nc->spatial) {
+			} else
+#endif
+					if (nc->spatial) {
 				if (nc->loc_used) {
 					nc->spatial->set_translation(nc->loc_accum);
 				}
@@ -1649,6 +1663,7 @@ Ref<AnimatedValuesBackup> AnimationPlayer::backup_animated_values(Node *p_root_o
 			continue;
 		}
 
+#ifdef MODULE_SKELETON_3D_ENABLED
 		if (nc->skeleton) {
 			if (nc->bone_idx == -1) {
 				continue;
@@ -1664,7 +1679,9 @@ Ref<AnimatedValuesBackup> AnimationPlayer::backup_animated_values(Node *p_root_o
 			entry.value = nc;
 
 			backup->entries.push_back(entry);
-		} else {
+		} else
+#endif
+		{
 			if (nc->spatial) {
 				AnimatedValuesBackup::Entry entry;
 				entry.object = nc->spatial;
diff --git a/scene/animation/animation_player.h b/scene/animation/animation_player.h
index 54e00187b..da675ff6e 100644
--- a/scene/animation/animation_player.h
+++ b/scene/animation/animation_player.h
@@ -33,10 +33,14 @@
 #include "core/object/reference.h"
 #include "scene/main/node.h"
 
+#include "modules/modules_enabled.gen.h"
+
 class Resource;
 class Spatial;
 class Node2D;
+#ifdef MODULE_SKELETON_3D_ENABLED
 class Skeleton;
+#endif
 class Animation;
 
 #ifdef TOOLS_ENABLED
@@ -102,7 +106,9 @@ private:
 		Node *node;
 		Spatial *spatial;
 		Node2D *node_2d;
+#ifdef MODULE_SKELETON_3D_ENABLED
 		Skeleton *skeleton;
+#endif
 		int bone_idx;
 		// accumulated transforms
 
diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp
index e2ae28df1..e6cd28cb0 100644
--- a/scene/animation/animation_tree.cpp
+++ b/scene/animation/animation_tree.cpp
@@ -34,11 +34,14 @@
 #include "animation_player.h"
 #include "core/config/engine.h"
 #include "core/object/method_bind_ext.gen.inc"
-#include "scene/3d/skeleton.h"
 #include "scene/3d/spatial.h"
 #include "scene/scene_string_names.h"
 #include "servers/audio/audio_stream.h"
 
+#ifdef MODULE_SKELETON_3D_ENABLED
+#include "modules/skeleton_3d/nodes/skeleton.h"
+#endif
+
 void AnimationNode::get_parameter_list(List<PropertyInfo> *r_list) const {
 	if (get_script_instance()) {
 		Array parameters = get_script_instance()->call("get_parameter_list");
@@ -626,10 +629,14 @@ bool AnimationTree::_update_caches(AnimationPlayer *player) {
 						TrackCacheTransform *track_xform = memnew(TrackCacheTransform);
 
 						track_xform->spatial = spatial;
+#ifdef MODULE_SKELETON_3D_ENABLED
 						track_xform->skeleton = nullptr;
 						track_xform->bone_idx = -1;
+#endif
 
 						bool has_rest = false;
+
+#ifdef MODULE_SKELETON_3D_ENABLED
 						if (path.get_subname_count() == 1 && Object::cast_to<Skeleton>(spatial)) {
 							Skeleton *sk = Object::cast_to<Skeleton>(spatial);
 							track_xform->skeleton = sk;
@@ -644,6 +651,7 @@ bool AnimationTree::_update_caches(AnimationPlayer *player) {
 								track_xform->init_scale = rest.basis.get_scale();
 							}
 						}
+#endif
 
 						track_xform->object = spatial;
 						track_xform->object_id = track_xform->object->get_instance_id();
@@ -1480,7 +1488,9 @@ void AnimationTree::_process_graph(float p_delta) {
 						xform.basis.set_quaternion_scale(t->rot, t->scale);
 
 						root_motion_transform = xform;
-					} else if (t->skeleton && t->bone_idx >= 0) {
+					}
+#ifdef MODULE_SKELETON_3D_ENABLED
+					else if (t->skeleton && t->bone_idx >= 0) {
 						if (t->loc_used) {
 							t->skeleton->set_bone_pose_position(t->bone_idx, t->loc);
 						}
@@ -1502,6 +1512,7 @@ void AnimationTree::_process_graph(float p_delta) {
 							t->spatial->set_scale(t->scale);
 						}
 					}
+#endif
 #endif // _3D_DISABLED
 				} break;
 				case Animation::TYPE_VALUE: {
diff --git a/scene/animation/animation_tree.h b/scene/animation/animation_tree.h
index 5c6b0de6f..ac2486a8f 100644
--- a/scene/animation/animation_tree.h
+++ b/scene/animation/animation_tree.h
@@ -34,8 +34,12 @@
 #include "scene/main/node.h"
 #include "scene/resources/animation.h"
 
+#include "modules/modules_enabled.gen.h"
+
 class Spatial;
+#ifdef MODULE_SKELETON_3D_ENABLED
 class Skeleton;
+#endif
 class AnimationNodeBlendTree;
 class AnimationPlayer;
 class AnimationTree;
@@ -186,8 +190,10 @@ private:
 
 	struct TrackCacheTransform : public TrackCache {
 		Spatial *spatial;
+#ifdef MODULE_SKELETON_3D_ENABLED
 		Skeleton *skeleton;
 		int bone_idx;
+#endif
 		bool loc_used;
 		bool rot_used;
 		bool scale_used;
diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp
index 5acec288d..ad76058be 100644
--- a/scene/register_scene_types.cpp
+++ b/scene/register_scene_types.cpp
@@ -166,7 +166,6 @@
 #include "scene/resources/resource_format_text.h"
 #include "scene/resources/segment_shape_2d.h"
 
-#include "scene/resources/skin.h"
 #include "scene/resources/sky.h"
 #include "scene/resources/sphere_shape.h"
 #include "scene/resources/surface_tool.h"
@@ -177,19 +176,10 @@
 #include "scene/resources/world_2d.h"
 #include "scene/scene_string_names.h"
 
-#include "scene/resources/skeleton_modification_3d.h"
-#include "scene/resources/skeleton_modification_3d_ccdik.h"
-#include "scene/resources/skeleton_modification_3d_fabrik.h"
-#include "scene/resources/skeleton_modification_3d_jiggle.h"
-#include "scene/resources/skeleton_modification_3d_lookat.h"
-#include "scene/resources/skeleton_modification_3d_stackholder.h"
-#include "scene/resources/skeleton_modification_3d_twoboneik.h"
-#include "scene/resources/skeleton_modification_stack_3d.h"
 
 #ifndef _3D_DISABLED
 #include "scene/3d/area.h"
 #include "scene/3d/audio_stream_player_3d.h"
-#include "scene/3d/bone_attachment.h"
 #include "scene/3d/camera.h"
 #include "scene/3d/collision_polygon.h"
 #include "scene/3d/collision_shape.h"
@@ -218,14 +208,12 @@
 #include "scene/3d/room_group.h"
 #include "scene/3d/room_manager.h"
 #include "scene/3d/shape_cast.h"
-#include "scene/3d/skeleton.h"
 #include "scene/3d/soft_body.h"
 #include "scene/3d/spatial_velocity_tracker.h"
 #include "scene/3d/spring_arm.h"
 #include "scene/3d/sprite_3d.h"
 #include "scene/3d/vehicle_body.h"
 #include "scene/3d/visibility_notifier.h"
-#include "scene/animation/skeleton_ik.h"
 #include "scene/resources/environment.h"
 #include "scene/resources/multimesh.h"
 #include "scene/resources/occluder_shape.h"
@@ -392,12 +380,8 @@ void register_scene_types() {
 
 	/* REGISTER 3D */
 
-	ClassDB::register_class<Skin>();
-	ClassDB::register_virtual_class<SkinReference>();
-
 	ClassDB::register_class<Spatial>();
 	ClassDB::register_virtual_class<SpatialGizmo>();
-	ClassDB::register_class<Skeleton>();
 	ClassDB::register_class<AnimationPlayer>();
 	ClassDB::register_class<Tween>();
 	ClassDB::register_class<SceneTreeTween>();
@@ -473,12 +457,8 @@ void register_scene_types() {
 	ClassDB::register_class<KinematicBody>();
 	ClassDB::register_class<SpringArm>();
 
-	ClassDB::register_class<PhysicalBone>();
 	ClassDB::register_class<SoftBody>();
 
-	ClassDB::register_class<SkeletonIK>();
-	ClassDB::register_class<BoneAttachment>();
-
 	ClassDB::register_class<VehicleBody>();
 	ClassDB::register_class<VehicleWheel>();
 	ClassDB::register_class<Area>();
@@ -617,17 +597,6 @@ void register_scene_types() {
 
 	OS::get_singleton()->yield(); //may take time to init
 
-	ClassDB::register_class<SkeletonModificationStack3D>();
-	ClassDB::register_class<SkeletonModification3D>();
-	ClassDB::register_class<SkeletonModification3DLookAt>();
-	ClassDB::register_class<SkeletonModification3DCCDIK>();
-	ClassDB::register_class<SkeletonModification3DFABRIK>();
-	ClassDB::register_class<SkeletonModification3DJiggle>();
-	ClassDB::register_class<SkeletonModification3DTwoBoneIK>();
-	ClassDB::register_class<SkeletonModification3DStackHolder>();
-
-	OS::get_singleton()->yield(); //may take time to init
-
 	ClassDB::register_class<SpatialVelocityTracker>();
 
 #endif