diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h
index a3595b3c4..803e463af 100644
--- a/core/bind/core_bind.h
+++ b/core/bind/core_bind.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/compression.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
@@ -39,7 +39,7 @@
 #include "core/os/os.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 class _ResourceLoader : public Object {
 	GDCLASS(_ResourceLoader, Object);
diff --git a/core/bitfield_dynamic.cpp b/core/containers/bitfield_dynamic.cpp
similarity index 100%
rename from core/bitfield_dynamic.cpp
rename to core/containers/bitfield_dynamic.cpp
diff --git a/core/bitfield_dynamic.h b/core/containers/bitfield_dynamic.h
similarity index 100%
rename from core/bitfield_dynamic.h
rename to core/containers/bitfield_dynamic.h
diff --git a/core/command_queue_mt.cpp b/core/containers/command_queue_mt.cpp
similarity index 100%
rename from core/command_queue_mt.cpp
rename to core/containers/command_queue_mt.cpp
diff --git a/core/command_queue_mt.h b/core/containers/command_queue_mt.h
similarity index 100%
rename from core/command_queue_mt.h
rename to core/containers/command_queue_mt.h
diff --git a/core/containers/cowdata.h b/core/containers/cowdata.h
index c3a535f0c..8d9d7ba82 100644
--- a/core/containers/cowdata.h
+++ b/core/containers/cowdata.h
@@ -34,7 +34,7 @@
 
 #include "core/error/error_macros.h"
 #include "core/os/memory.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 template <class T>
 class Vector;
diff --git a/core/containers/pool_vector.h b/core/containers/pool_vector.h
index 951b6b6e9..b0a8a46c3 100644
--- a/core/containers/pool_vector.h
+++ b/core/containers/pool_vector.h
@@ -33,8 +33,8 @@
 #include "core/os/memory.h"
 #include "core/os/mutex.h"
 #include "core/os/rw_lock.h"
-#include "core/pool_allocator.h"
-#include "core/safe_refcount.h"
+#include "core/os/pool_allocator.h"
+#include "core/os/safe_refcount.h"
 #include "core/string/ustring.h"
 
 struct MemoryPool {
diff --git a/core/containers/rid.h b/core/containers/rid.h
index 97181f616..4e67da2d6 100644
--- a/core/containers/rid.h
+++ b/core/containers/rid.h
@@ -33,7 +33,7 @@
 #include "core/containers/list.h"
 #include "core/os/memory.h"
 #include "core/containers/rid_handle.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/containers/set.h"
 #include "core/typedefs.h"
 
diff --git a/core/containers/rid_handle.h b/core/containers/rid_handle.h
index 9e1d3a656..687ef17bf 100644
--- a/core/containers/rid_handle.h
+++ b/core/containers/rid_handle.h
@@ -33,7 +33,7 @@
 #include "core/containers/list.h"
 #include "core/os/mutex.h"
 #include "core/containers/pooled_list.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/typedefs.h"
 
 #include <typeinfo>
diff --git a/core/error/error_macros.h b/core/error/error_macros.h
index f29f9a3cc..061fdf9e7 100644
--- a/core/error/error_macros.h
+++ b/core/error/error_macros.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/typedefs.h"
 
 /**
diff --git a/core/image.cpp b/core/io/image.cpp
similarity index 100%
rename from core/image.cpp
rename to core/io/image.cpp
diff --git a/core/image.h b/core/io/image.h
similarity index 100%
rename from core/image.h
rename to core/io/image.h
diff --git a/core/io/image_loader.h b/core/io/image_loader.h
index 98ff09a5c..4fe23cd04 100644
--- a/core/io/image_loader.h
+++ b/core/io/image_loader.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/resource_loader.h"
 #include "core/containers/list.h"
 #include "core/os/file_access.h"
diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp
index 04e7d3cb3..4d8706cb2 100644
--- a/core/io/resource_format_binary.cpp
+++ b/core/io/resource_format_binary.cpp
@@ -30,7 +30,7 @@
 
 #include "resource_format_binary.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/file_access_compressed.h"
 #include "core/io/marshalls.h"
 #include "core/os/dir_access.h"
diff --git a/core/math/expression.cpp b/core/math/expression.cpp
index b97ca7c0b..0bd0d91d6 100644
--- a/core/math/expression.cpp
+++ b/core/math/expression.cpp
@@ -31,7 +31,7 @@
 #include "expression.h"
 
 #include "core/object/class_db.h"
-#include "core/func_ref.h"
+#include "core/object/func_ref.h"
 #include "core/io/marshalls.h"
 #include "core/math/math_funcs.h"
 #include "core/os/os.h"
diff --git a/core/func_ref.cpp b/core/object/func_ref.cpp
similarity index 100%
rename from core/func_ref.cpp
rename to core/object/func_ref.cpp
diff --git a/core/func_ref.h b/core/object/func_ref.h
similarity index 100%
rename from core/func_ref.h
rename to core/object/func_ref.h
diff --git a/core/object/object.h b/core/object/object.h
index 947ad4b53..1c30a81fa 100644
--- a/core/object/object.h
+++ b/core/object/object.h
@@ -35,7 +35,7 @@
 #include "core/containers/map.h"
 #include "core/object/object_id.h"
 #include "core/os/rw_lock.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/containers/set.h"
 #include "core/variant/variant.h"
 #include "core/containers/vmap.h"
diff --git a/core/object/reference.h b/core/object/reference.h
index 8031a5adf..b1cfcaad3 100644
--- a/core/object/reference.h
+++ b/core/object/reference.h
@@ -33,7 +33,7 @@
 #include "core/object/class_db.h"
 #include "core/object/object.h"
 #include "core/object/ref_ptr.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 class Reference : public Object {
 	GDCLASS(Reference, Object);
diff --git a/core/object/resource.h b/core/object/resource.h
index 3add0cb8e..2098a70cb 100644
--- a/core/object/resource.h
+++ b/core/object/resource.h
@@ -34,7 +34,7 @@
 #include "core/object/object.h"
 #include "core/object/ref_ptr.h"
 #include "core/object/reference.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/containers/self_list.h"
 
 #define RES_BASE_EXTENSION(m_ext)                                                                                   \
diff --git a/core/script_debugger_local.cpp b/core/object/script_debugger_local.cpp
similarity index 100%
rename from core/script_debugger_local.cpp
rename to core/object/script_debugger_local.cpp
diff --git a/core/script_debugger_local.h b/core/object/script_debugger_local.h
similarity index 100%
rename from core/script_debugger_local.h
rename to core/object/script_debugger_local.h
diff --git a/core/os/memory.cpp b/core/os/memory.cpp
index a539fcbf1..0a36166a5 100644
--- a/core/os/memory.cpp
+++ b/core/os/memory.cpp
@@ -31,7 +31,7 @@
 #include "memory.h"
 
 #include "core/error/error_macros.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/core/os/memory.h b/core/os/memory.h
index e4ee03396..4df9bb2ac 100644
--- a/core/os/memory.h
+++ b/core/os/memory.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/error/error_macros.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 #include <stddef.h>
 
diff --git a/core/os/os.h b/core/os/os.h
index 386428a0e..8dd93927d 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/config/engine.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/logger.h"
 #include "core/containers/list.h"
 #include "core/os/main_loop.h"
diff --git a/core/pool_allocator.cpp b/core/os/pool_allocator.cpp
similarity index 100%
rename from core/pool_allocator.cpp
rename to core/os/pool_allocator.cpp
diff --git a/core/pool_allocator.h b/core/os/pool_allocator.h
similarity index 100%
rename from core/pool_allocator.h
rename to core/os/pool_allocator.h
diff --git a/core/safe_refcount.cpp b/core/os/safe_refcount.cpp
similarity index 100%
rename from core/safe_refcount.cpp
rename to core/os/safe_refcount.cpp
diff --git a/core/safe_refcount.h b/core/os/safe_refcount.h
similarity index 100%
rename from core/safe_refcount.h
rename to core/os/safe_refcount.h
diff --git a/core/os/thread.cpp b/core/os/thread.cpp
index 1bad739c8..dc01f70f3 100644
--- a/core/os/thread.cpp
+++ b/core/os/thread.cpp
@@ -36,7 +36,7 @@
 
 #if !defined(NO_THREADS)
 
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 Error (*Thread::set_name_func)(const String &) = nullptr;
 void (*Thread::set_priority_func)(Thread::Priority) = nullptr;
diff --git a/core/os/thread.h b/core/os/thread.h
index 6bd444ec9..b9e4e42a6 100644
--- a/core/os/thread.h
+++ b/core/os/thread.h
@@ -40,7 +40,7 @@
 #include "core/typedefs.h"
 
 #if !defined(NO_THREADS)
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include <thread>
 #endif
 
diff --git a/core/os/threaded_array_processor.h b/core/os/threaded_array_processor.h
index 77046de1a..dfe67b9e4 100644
--- a/core/os/threaded_array_processor.h
+++ b/core/os/threaded_array_processor.h
@@ -34,7 +34,7 @@
 #include "core/os/os.h"
 #include "core/os/thread.h"
 #include "core/os/thread_safe.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 template <class C, class U>
 struct ThreadArrayProcessData {
diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp
index 8b98db455..e9422d39c 100644
--- a/core/register_core_types.cpp
+++ b/core/register_core_types.cpp
@@ -38,7 +38,7 @@
 #include "core/crypto/crypto.h"
 #include "core/crypto/hashing_context.h"
 #include "core/config/engine.h"
-#include "core/func_ref.h"
+#include "core/object/func_ref.h"
 #include "core/input/input_map.h"
 #include "core/io/config_file.h"
 #include "core/io/dtls_server.h"
diff --git a/core/string/string_name.h b/core/string/string_name.h
index 1727ee057..a1a685ed2 100644
--- a/core/string/string_name.h
+++ b/core/string/string_name.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/os/mutex.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/string/ustring.h"
 
 struct StaticCString {
diff --git a/core/variant/dictionary.cpp b/core/variant/dictionary.cpp
index 483eec77e..5a95d44f8 100644
--- a/core/variant/dictionary.cpp
+++ b/core/variant/dictionary.cpp
@@ -31,7 +31,7 @@
 #include "dictionary.h"
 
 #include "core/containers/ordered_hash_map.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/variant/variant.h"
 
 struct DictionaryPrivate {
diff --git a/drivers/png/png_driver_common.h b/drivers/png/png_driver_common.h
index c55b3aad7..38694451b 100644
--- a/drivers/png/png_driver_common.h
+++ b/drivers/png/png_driver_common.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/containers/pool_vector.h"
 
 namespace PNGDriverCommon {
diff --git a/drivers/png/resource_saver_png.cpp b/drivers/png/resource_saver_png.cpp
index b35f4c444..e51a12756 100644
--- a/drivers/png/resource_saver_png.cpp
+++ b/drivers/png/resource_saver_png.cpp
@@ -30,7 +30,7 @@
 
 #include "resource_saver_png.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/os/file_access.h"
 #include "drivers/png/png_driver_common.h"
 #include "scene/resources/texture.h"
diff --git a/drivers/png/resource_saver_png.h b/drivers/png/resource_saver_png.h
index 4f39eeb3a..43f5122cd 100644
--- a/drivers/png/resource_saver_png.h
+++ b/drivers/png/resource_saver_png.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/resource_saver.h"
 
 class ResourceSaverPNG : public ResourceFormatSaver {
diff --git a/editor/audio_stream_preview.h b/editor/audio_stream_preview.h
index 13180ca53..0af9ba07b 100644
--- a/editor/audio_stream_preview.h
+++ b/editor/audio_stream_preview.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/os/thread.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 #include "scene/main/node.h"
 #include "servers/audio/audio_stream.h"
diff --git a/editor/editor_file_system.h b/editor/editor_file_system.h
index 8f12aeb5d..964b1675e 100644
--- a/editor/editor_file_system.h
+++ b/editor/editor_file_system.h
@@ -36,7 +36,7 @@
 #include "core/os/dir_access.h"
 #include "core/os/thread.h"
 #include "core/os/thread_safe.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/containers/set.h"
 #include "core/error/error_list.h"
 #include "core/containers/hash_map.h"
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 45b7cd59d..d536a24a8 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -37,7 +37,7 @@
 #include "core/math/color.h"
 #include "core/config/engine.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/config_file.h"
 #include "core/io/image_loader.h"
 #include "core/io/resource_importer.h"
diff --git a/editor/editor_node.h b/editor/editor_node.h
index d05efa590..092f5e746 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -53,7 +53,7 @@
 #include "core/string/print_string.h"
 #include "core/object/reference.h"
 #include "core/object/resource.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/containers/set.h"
 #include "core/string/string_name.h"
 #include "core/typedefs.h"
diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp
index d05835588..1d9526bfe 100644
--- a/editor/editor_plugin.cpp
+++ b/editor/editor_plugin.cpp
@@ -44,7 +44,7 @@
 #include "servers/visual_server.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/resource_importer.h"
 #include "core/math/aabb.h"
 #include "core/math/basis.h"
diff --git a/editor/editor_profiler.cpp b/editor/editor_profiler.cpp
index 52ccfc17d..e0857b675 100644
--- a/editor/editor_profiler.cpp
+++ b/editor/editor_profiler.cpp
@@ -35,7 +35,7 @@
 #include "scene/main/timer.h"
 #include "core/object/class_db.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/math_funcs.h"
 #include "core/math/vector2.h"
 #include "core/input/input_event.h"
diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp
index 915192014..d5b9fdcc7 100644
--- a/editor/editor_resource_preview.cpp
+++ b/editor/editor_resource_preview.cpp
@@ -42,7 +42,7 @@
 #include "editor_settings.h"
 #include "core/error/error_list.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 
 #include "core/os/memory.h"
 #include "core/os/os.h"
diff --git a/editor/editor_resource_preview.h b/editor/editor_resource_preview.h
index f8605d9b1..6af808537 100644
--- a/editor/editor_resource_preview.h
+++ b/editor/editor_resource_preview.h
@@ -35,7 +35,7 @@
 
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/containers/list.h"
 #include "core/containers/map.h"
 #include "core/math/vector2.h"
diff --git a/editor/editor_run_native.cpp b/editor/editor_run_native.cpp
index 1d2347869..8d5e22e63 100644
--- a/editor/editor_run_native.cpp
+++ b/editor/editor_run_native.cpp
@@ -32,7 +32,7 @@
 
 #include "core/object/class_db.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/os/memory.h"
 #include "core/object/reference.h"
 #include "core/typedefs.h"
diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp
index 7a09ca2c0..a104f1e91 100644
--- a/editor/editor_themes.cpp
+++ b/editor/editor_themes.cpp
@@ -41,7 +41,7 @@
 #include "modules/modules_enabled.gen.h" // For svg.
 #include "core/math/color.h"
 #include "core/variant/dictionary.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/vector2.h"
diff --git a/editor/import/resource_importer_bitmask.cpp b/editor/import/resource_importer_bitmask.cpp
index 7ec35f6fd..f3c5f987d 100644
--- a/editor/import/resource_importer_bitmask.cpp
+++ b/editor/import/resource_importer_bitmask.cpp
@@ -29,14 +29,14 @@
 /*************************************************************************/
 
 #include "resource_importer_bitmask.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/config_file.h"
 #include "core/io/image_loader.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
 #include "scene/resources/bit_map.h"
 #include "scene/resources/texture.h"
-#include "core/image.h"
+#include "core/io/image.h"
 
 String ResourceImporterBitMap::get_importer_name() const {
 	return "bitmap";
diff --git a/editor/import/resource_importer_image.cpp b/editor/import/resource_importer_image.cpp
index fdc96ba36..8c9d5ca07 100644
--- a/editor/import/resource_importer_image.cpp
+++ b/editor/import/resource_importer_image.cpp
@@ -34,7 +34,7 @@
 #include "core/io/resource_saver.h"
 #include "core/os/file_access.h"
 #include "scene/resources/texture.h"
-#include "core/image.h"
+#include "core/io/image.h"
 
 String ResourceImporterImage::get_importer_name() const {
 	return "image";
diff --git a/editor/import/resource_importer_layered_texture.h b/editor/import/resource_importer_layered_texture.h
index 41e632b4f..e7524db57 100644
--- a/editor/import/resource_importer_layered_texture.h
+++ b/editor/import/resource_importer_layered_texture.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/resource_importer.h"
 
 class StreamTexture;
diff --git a/editor/import/resource_importer_texture.h b/editor/import/resource_importer_texture.h
index 272dd2ff4..c968714be 100644
--- a/editor/import/resource_importer_texture.h
+++ b/editor/import/resource_importer_texture.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/resource_importer.h"
 
 class StreamTexture;
diff --git a/editor/import/resource_importer_texture_atlas.h b/editor/import/resource_importer_texture_atlas.h
index 0a3793a24..990a71906 100644
--- a/editor/import/resource_importer_texture_atlas.h
+++ b/editor/import/resource_importer_texture_atlas.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/resource_importer.h"
 
 class ResourceImporterTextureAtlas : public ResourceImporter {
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
index 6fd301ec1..ef22cc60c 100644
--- a/editor/plugins/animation_player_editor_plugin.cpp
+++ b/editor/plugins/animation_player_editor_plugin.cpp
@@ -48,7 +48,7 @@
 #include "core/math/color.h"
 #include "core/error/error_list.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/containers/list.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
diff --git a/editor/plugins/cpu_particles_2d_editor_plugin.cpp b/editor/plugins/cpu_particles_2d_editor_plugin.cpp
index 140fdf376..05f18cd59 100644
--- a/editor/plugins/cpu_particles_2d_editor_plugin.cpp
+++ b/editor/plugins/cpu_particles_2d_editor_plugin.cpp
@@ -37,7 +37,7 @@
 #include "core/math/color.h"
 #include "core/error/error_list.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
diff --git a/editor/plugins/curve_editor_plugin.cpp b/editor/plugins/curve_editor_plugin.cpp
index 027c8e174..c039f0ee7 100644
--- a/editor/plugins/curve_editor_plugin.cpp
+++ b/editor/plugins/curve_editor_plugin.cpp
@@ -37,7 +37,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
diff --git a/editor/plugins/editor_preview_plugins.cpp b/editor/plugins/editor_preview_plugins.cpp
index 0c8878142..f443f0eed 100644
--- a/editor/plugins/editor_preview_plugins.cpp
+++ b/editor/plugins/editor_preview_plugins.cpp
@@ -44,7 +44,7 @@
 #include "core/math/color.h"
 #include "core/error/error_list.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/containers/list.h"
 #include "core/math/aabb.h"
 #include "core/math/audio_frame.h"
diff --git a/editor/plugins/editor_preview_plugins.h b/editor/plugins/editor_preview_plugins.h
index 134c87e26..46d475a61 100644
--- a/editor/plugins/editor_preview_plugins.h
+++ b/editor/plugins/editor_preview_plugins.h
@@ -32,7 +32,7 @@
 
 #include "editor/editor_resource_preview.h"
 
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/math/vector2.h"
 #include "core/object/object.h"
 #include "core/object/reference.h"
diff --git a/editor/plugins/sprite_editor_plugin.cpp b/editor/plugins/sprite_editor_plugin.cpp
index 105d8e48f..1c4a10394 100644
--- a/editor/plugins/sprite_editor_plugin.cpp
+++ b/editor/plugins/sprite_editor_plugin.cpp
@@ -44,7 +44,7 @@
 #include "core/object/class_db.h"
 #include "core/math/color.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/geometry.h"
 #include "core/math/rect2.h"
 #include "core/os/memory.h"
diff --git a/editor/plugins/texture_editor_plugin.cpp b/editor/plugins/texture_editor_plugin.cpp
index 9b9b0eb1d..8330752c6 100644
--- a/editor/plugins/texture_editor_plugin.cpp
+++ b/editor/plugins/texture_editor_plugin.cpp
@@ -34,7 +34,7 @@
 #include "scene/resources/dynamic_font.h"
 #include "core/object/class_db.h"
 #include "core/math/color.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
 #include "scene/gui/control.h"
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp
index 684c53405..9c6f50247 100644
--- a/editor/project_manager.cpp
+++ b/editor/project_manager.cpp
@@ -35,7 +35,7 @@
 #include "core/config/engine.h"
 #include "core/error/error_list.h"
 #include "core/error/error_macros.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/io/config_file.h"
 #include "core/io/resource_saver.h"
 #include "core/io/stream_peer_ssl.h"
diff --git a/main/main.cpp b/main/main.cpp
index f77a6fd8f..f023610ce 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -44,7 +44,7 @@
 #include "core/os/time.h"
 #include "core/config/project_settings.h"
 #include "core/register_core_types.h"
-#include "core/script_debugger_local.h"
+#include "core/object/script_debugger_local.h"
 #include "core/object/script_language.h"
 #include "core/string/translation.h"
 #include "core/version.h"
diff --git a/modules/cscript/cscript_functions.cpp b/modules/cscript/cscript_functions.cpp
index 006745c51..1191e380a 100644
--- a/modules/cscript/cscript_functions.cpp
+++ b/modules/cscript/cscript_functions.cpp
@@ -31,7 +31,7 @@
 #include "cscript_functions.h"
 
 #include "core/object/class_db.h"
-#include "core/func_ref.h"
+#include "core/object/func_ref.h"
 #include "core/io/json.h"
 #include "core/io/marshalls.h"
 #include "core/math/math_funcs.h"
diff --git a/modules/cvtt/image_compress_cvtt.cpp b/modules/cvtt/image_compress_cvtt.cpp
index d47367f18..e402189d5 100644
--- a/modules/cvtt/image_compress_cvtt.cpp
+++ b/modules/cvtt/image_compress_cvtt.cpp
@@ -33,7 +33,7 @@
 #include "core/os/os.h"
 #include "core/os/thread.h"
 #include "core/string/print_string.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 
 #include <ConvectionKernels.h>
 
diff --git a/modules/cvtt/image_compress_cvtt.h b/modules/cvtt/image_compress_cvtt.h
index 1e1f66aab..5d637d277 100644
--- a/modules/cvtt/image_compress_cvtt.h
+++ b/modules/cvtt/image_compress_cvtt.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 
 void image_compress_cvtt(Image *p_image, float p_lossy_quality, Image::CompressSource p_source);
 void image_decompress_cvtt(Image *p_image);
diff --git a/modules/etc/image_compress_etc.cpp b/modules/etc/image_compress_etc.cpp
index a84cb04ce..6d14feb28 100644
--- a/modules/etc/image_compress_etc.cpp
+++ b/modules/etc/image_compress_etc.cpp
@@ -30,7 +30,7 @@
 
 #include "image_compress_etc.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 
diff --git a/modules/gdscript/gdscript_functions.cpp b/modules/gdscript/gdscript_functions.cpp
index da750c8a8..79563e2f2 100644
--- a/modules/gdscript/gdscript_functions.cpp
+++ b/modules/gdscript/gdscript_functions.cpp
@@ -31,7 +31,7 @@
 #include "gdscript_functions.h"
 
 #include "core/object/class_db.h"
-#include "core/func_ref.h"
+#include "core/object/func_ref.h"
 #include "core/io/json.h"
 #include "core/io/marshalls.h"
 #include "core/math/math_funcs.h"
diff --git a/modules/gltf/gltf_spec_gloss.h b/modules/gltf/gltf_spec_gloss.h
index 952553540..72aba9db9 100644
--- a/modules/gltf/gltf_spec_gloss.h
+++ b/modules/gltf/gltf_spec_gloss.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/resource.h"
 
 class GLTFSpecGloss : public Resource {
diff --git a/modules/material_maker/nodes/mm_material.h b/modules/material_maker/nodes/mm_material.h
index 9b8a25c87..30d63b1fa 100644
--- a/modules/material_maker/nodes/mm_material.h
+++ b/modules/material_maker/nodes/mm_material.h
@@ -1,7 +1,7 @@
 #ifndef MAT_MAKER_MATERIAL_H
 #define MAT_MAKER_MATERIAL_H
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "core/object/reference.h"
diff --git a/modules/material_maker/nodes/mm_node.h b/modules/material_maker/nodes/mm_node.h
index 2a325e6ac..959f21a4b 100644
--- a/modules/material_maker/nodes/mm_node.h
+++ b/modules/material_maker/nodes/mm_node.h
@@ -1,7 +1,7 @@
 #ifndef MAT_MAKER_NODE_H
 #define MAT_MAKER_NODE_H
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "core/variant/variant.h"
diff --git a/modules/material_maker/nodes/mm_node_universal_property.h b/modules/material_maker/nodes/mm_node_universal_property.h
index 907d9c04f..19bf6f0bc 100644
--- a/modules/material_maker/nodes/mm_node_universal_property.h
+++ b/modules/material_maker/nodes/mm_node_universal_property.h
@@ -1,7 +1,7 @@
 #ifndef MM_NODE_UNIVERSAL_PROPERTY_H
 #define MM_NODE_UNIVERSAL_PROPERTY_H
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "core/object/method_bind.h"
diff --git a/modules/mesh_data_resource/nodes/mesh_data_instance.cpp b/modules/mesh_data_resource/nodes/mesh_data_instance.cpp
index d134f0a0d..2acb7f3a0 100644
--- a/modules/mesh_data_resource/nodes/mesh_data_instance.cpp
+++ b/modules/mesh_data_resource/nodes/mesh_data_instance.cpp
@@ -2,7 +2,7 @@
 
 #include "scene/resources/texture.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 
 #if TEXTURE_PACKER_PRESENT
 #include "../../texture_packer/texture_resource/packer_image_resource.h"
diff --git a/modules/mesh_data_resource/nodes/mesh_data_instance_2d.cpp b/modules/mesh_data_resource/nodes/mesh_data_instance_2d.cpp
index 7d3854056..7aeab40fe 100644
--- a/modules/mesh_data_resource/nodes/mesh_data_instance_2d.cpp
+++ b/modules/mesh_data_resource/nodes/mesh_data_instance_2d.cpp
@@ -2,7 +2,7 @@
 
 #include "scene/resources/texture.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 
 #if TEXTURE_PACKER_PRESENT
 #include "../../texture_packer/texture_resource/packer_image_resource.h"
diff --git a/modules/opensimplex/noise_texture.h b/modules/opensimplex/noise_texture.h
index c59b813f3..1b09db543 100644
--- a/modules/opensimplex/noise_texture.h
+++ b/modules/opensimplex/noise_texture.h
@@ -32,7 +32,7 @@
 
 #include "open_simplex_noise.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/reference.h"
 #include "editor/editor_node.h"
 #include "editor/editor_plugin.h"
diff --git a/modules/opensimplex/open_simplex_noise.h b/modules/opensimplex/open_simplex_noise.h
index fe4d58dbe..e28f52d07 100644
--- a/modules/opensimplex/open_simplex_noise.h
+++ b/modules/opensimplex/open_simplex_noise.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/reference.h"
 #include "scene/resources/texture.h"
 
diff --git a/modules/paint/dialogs/paint_save_file_dialog.cpp b/modules/paint/dialogs/paint_save_file_dialog.cpp
index 39a3c9508..b71104e4a 100644
--- a/modules/paint/dialogs/paint_save_file_dialog.cpp
+++ b/modules/paint/dialogs/paint_save_file_dialog.cpp
@@ -27,7 +27,7 @@ SOFTWARE.
 #include "../paint_canvas.h"
 #include "../paint_canvas_layer.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
 
diff --git a/modules/paint/paint_canvas_layer.h b/modules/paint/paint_canvas_layer.h
index a32fe54ee..8cd68ce72 100644
--- a/modules/paint/paint_canvas_layer.h
+++ b/modules/paint/paint_canvas_layer.h
@@ -27,7 +27,7 @@ SOFTWARE.
 
 #include "core/object/reference.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "scene/resources/texture.h"
 
 class TextureRect;
diff --git a/modules/paint/paint_layer_button.cpp b/modules/paint/paint_layer_button.cpp
index 430a0d4a8..b12b54bba 100644
--- a/modules/paint/paint_layer_button.cpp
+++ b/modules/paint/paint_layer_button.cpp
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "paint_layer_button.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "scene/resources/style_box.h"
 #include "scene/resources/texture.h"
 
diff --git a/modules/paint/paint_window.cpp b/modules/paint/paint_window.cpp
index f514c6666..17103ef37 100644
--- a/modules/paint/paint_window.cpp
+++ b/modules/paint/paint_window.cpp
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "paint_window.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/input/input.h"
 #include "scene/resources/texture.h"
 
diff --git a/modules/props/tiled_wall/tiled_wall.cpp b/modules/props/tiled_wall/tiled_wall.cpp
index c8a2b7339..113e93a0d 100644
--- a/modules/props/tiled_wall/tiled_wall.cpp
+++ b/modules/props/tiled_wall/tiled_wall.cpp
@@ -2,7 +2,7 @@
 
 #include "scene/resources/texture.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 
 #if TEXTURE_PACKER_PRESENT
 #include "../../texture_packer/texture_resource/packer_image_resource.h"
diff --git a/modules/props_2d/tiled_wall/tiled_wall_2d.cpp b/modules/props_2d/tiled_wall/tiled_wall_2d.cpp
index 7ca2dc4a4..048f6d9fc 100644
--- a/modules/props_2d/tiled_wall/tiled_wall_2d.cpp
+++ b/modules/props_2d/tiled_wall/tiled_wall_2d.cpp
@@ -2,7 +2,7 @@
 
 #include "scene/resources/texture.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 
 #if TEXTURE_PACKER_PRESENT
 #include "../../texture_packer/texture_resource/packer_image_resource.h"
diff --git a/modules/pvr/image_compress_pvrtc.cpp b/modules/pvr/image_compress_pvrtc.cpp
index e5765a2b1..3c9e80b35 100644
--- a/modules/pvr/image_compress_pvrtc.cpp
+++ b/modules/pvr/image_compress_pvrtc.cpp
@@ -30,7 +30,7 @@
 
 #include "image_compress_pvrtc.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/reference.h"
 
 #include <PvrTcEncoder.h>
diff --git a/modules/squish/image_compress_squish.h b/modules/squish/image_compress_squish.h
index 9485cf5aa..5c4b79bc9 100644
--- a/modules/squish/image_compress_squish.h
+++ b/modules/squish/image_compress_squish.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 
 void image_compress_squish(Image *p_image, float p_lossy_quality, Image::CompressSource p_source);
 void image_decompress_squish(Image *p_image);
diff --git a/modules/texture_packer/layers/texture_layer_merger.h b/modules/texture_packer/layers/texture_layer_merger.h
index 876088ed3..5cce9e840 100644
--- a/modules/texture_packer/layers/texture_layer_merger.h
+++ b/modules/texture_packer/layers/texture_layer_merger.h
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/reference.h"
 #include "core/containers/vector.h"
 
diff --git a/modules/texture_packer/texture_packer.h b/modules/texture_packer/texture_packer.h
index a9c0a33ac..e9b0090ca 100644
--- a/modules/texture_packer/texture_packer.h
+++ b/modules/texture_packer/texture_packer.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/math/color.h"
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/reference.h"
 #include "core/string/ustring.h"
 #include "core/containers/vector.h"
diff --git a/modules/texture_packer/texture_resource/packer_image_resource.h b/modules/texture_packer/texture_resource/packer_image_resource.h
index 9dcf89faa..f282b4d58 100644
--- a/modules/texture_packer/texture_resource/packer_image_resource.h
+++ b/modules/texture_packer/texture_resource/packer_image_resource.h
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/image.h"
+#include "core/io/image.h"
 
 #include "scene/resources/texture.h"
 
diff --git a/modules/texture_packer/texture_resource/packer_image_resource_importer.h b/modules/texture_packer/texture_resource/packer_image_resource_importer.h
index a4f7d217b..b7938951a 100644
--- a/modules/texture_packer/texture_resource/packer_image_resource_importer.h
+++ b/modules/texture_packer/texture_resource/packer_image_resource_importer.h
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/string/ustring.h"
 
 #include "core/io/resource_saver.h"
diff --git a/modules/theora/video_stream_theora.h b/modules/theora/video_stream_theora.h
index 9aa3b5cdb..d8f6aef65 100644
--- a/modules/theora/video_stream_theora.h
+++ b/modules/theora/video_stream_theora.h
@@ -35,7 +35,7 @@
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
 #include "core/containers/ring_buffer.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "scene/resources/video_stream.h"
 #include "servers/audio_server.h"
 
diff --git a/modules/wfc/image_indexer.h b/modules/wfc/image_indexer.h
index 3d34487e8..85317a0c6 100644
--- a/modules/wfc/image_indexer.h
+++ b/modules/wfc/image_indexer.h
@@ -1,7 +1,7 @@
 #ifndef IMAGE_INDEXER_H
 #define IMAGE_INDEXER_H
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/reference.h"
 #include "core/variant/variant.h"
 #include "core/containers/oa_hash_map.h"
diff --git a/platform/android/export/export_plugin.h b/platform/android/export/export_plugin.h
index fa512dcd5..b1223de71 100644
--- a/platform/android/export/export_plugin.h
+++ b/platform/android/export/export_plugin.h
@@ -36,7 +36,7 @@
 #include "core/os/file_access.h"
 #include "core/os/os.h"
 #include "core/config/project_settings.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/version.h"
 #include "drivers/png/png_driver_common.h"
 #include "editor/editor_export.h"
diff --git a/platform/iphone/export/export.cpp b/platform/iphone/export/export.cpp
index c0701e976..a4f2eecf3 100644
--- a/platform/iphone/export/export.cpp
+++ b/platform/iphone/export/export.cpp
@@ -36,7 +36,7 @@
 #include "core/os/file_access.h"
 #include "core/os/os.h"
 #include "core/config/project_settings.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/version.h"
 #include "editor/editor_export.h"
 #include "editor/editor_node.h"
diff --git a/scene/2d/audio_stream_player_2d.h b/scene/2d/audio_stream_player_2d.h
index df67b5e2d..d33b5c7a6 100644
--- a/scene/2d/audio_stream_player_2d.h
+++ b/scene/2d/audio_stream_player_2d.h
@@ -32,7 +32,7 @@
 
 #include "core/math/audio_frame.h"
 #include "core/object/reference.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "scene/2d/node_2d.h"
 
 class AudioStreamPlayback;
diff --git a/scene/3d/audio_stream_player_3d.h b/scene/3d/audio_stream_player_3d.h
index c46ad6835..4b7b78ee5 100644
--- a/scene/3d/audio_stream_player_3d.h
+++ b/scene/3d/audio_stream_player_3d.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "scene/3d/spatial.h"
 #include "servers/audio/audio_filter_sw.h"
 #include "servers/audio_server.h"
diff --git a/scene/3d/cpu_particles.h b/scene/3d/cpu_particles.h
index d0448cba9..60bc872ae 100644
--- a/scene/3d/cpu_particles.h
+++ b/scene/3d/cpu_particles.h
@@ -32,7 +32,7 @@
 
 #include "core/object/reference.h"
 #include "core/containers/rid.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "scene/3d/visual_instance.h"
 
 class Curve;
diff --git a/scene/3d/room_manager.cpp b/scene/3d/room_manager.cpp
index 156a957ba..7a8ec3ca3 100644
--- a/scene/3d/room_manager.cpp
+++ b/scene/3d/room_manager.cpp
@@ -30,7 +30,7 @@
 
 #include "room_manager.h"
 
-#include "core/bitfield_dynamic.h"
+#include "core/containers/bitfield_dynamic.h"
 #include "core/config/engine.h"
 #include "core/math/geometry.h"
 #include "core/math/quick_hull.h"
diff --git a/scene/audio/audio_stream_player.h b/scene/audio/audio_stream_player.h
index bab3eaaca..c0764d4b6 100644
--- a/scene/audio/audio_stream_player.h
+++ b/scene/audio/audio_stream_player.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "scene/main/node.h"
 #include "servers/audio/audio_stream.h"
 
diff --git a/scene/main/http_request.h b/scene/main/http_request.h
index 52ae14757..50779aa5d 100644
--- a/scene/main/http_request.h
+++ b/scene/main/http_request.h
@@ -32,7 +32,7 @@
 
 #include "core/io/http_client.h"
 #include "core/os/thread.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "node.h"
 
 class Timer;
diff --git a/scene/resources/bit_map.h b/scene/resources/bit_map.h
index eda7a8ff0..4a37b88e6 100644
--- a/scene/resources/bit_map.h
+++ b/scene/resources/bit_map.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/resource.h"
 
 class BitMap : public Resource {
diff --git a/servers/audio/audio_rb_resampler.h b/servers/audio/audio_rb_resampler.h
index d50351a61..3ed4b1291 100644
--- a/servers/audio/audio_rb_resampler.h
+++ b/servers/audio/audio_rb_resampler.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/os/memory.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/typedefs.h"
 #include "servers/audio_server.h"
 
diff --git a/servers/audio/audio_stream.h b/servers/audio/audio_stream.h
index 9e23f3f08..ac6f1522d 100644
--- a/servers/audio/audio_stream.h
+++ b/servers/audio/audio_stream.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/object/resource.h"
 #include "servers/audio/audio_filter_sw.h"
 #include "servers/audio_server.h"
diff --git a/servers/physics/shape_sw.cpp b/servers/physics/shape_sw.cpp
index 032d28296..6d7717ecc 100644
--- a/servers/physics/shape_sw.cpp
+++ b/servers/physics/shape_sw.cpp
@@ -30,7 +30,7 @@
 
 #include "shape_sw.h"
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/convex_hull.h"
 #include "core/math/geometry.h"
 #include "core/containers/sort_array.h"
diff --git a/servers/physics_2d/physics_2d_server_wrap_mt.h b/servers/physics_2d/physics_2d_server_wrap_mt.h
index ae3e68c22..442ede106 100644
--- a/servers/physics_2d/physics_2d_server_wrap_mt.h
+++ b/servers/physics_2d/physics_2d_server_wrap_mt.h
@@ -30,10 +30,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/command_queue_mt.h"
+#include "core/containers/command_queue_mt.h"
 #include "core/os/thread.h"
 #include "core/config/project_settings.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "servers/physics_2d_server.h"
 
 #ifdef DEBUG_SYNC
diff --git a/servers/visual/portals/portal_pvs_builder.h b/servers/visual/portals/portal_pvs_builder.h
index d5eab6a44..ae16c4ba5 100644
--- a/servers/visual/portals/portal_pvs_builder.h
+++ b/servers/visual/portals/portal_pvs_builder.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/bitfield_dynamic.h"
+#include "core/containers/bitfield_dynamic.h"
 #include "core/containers/local_vector.h"
 #include "core/math/plane.h"
 
diff --git a/servers/visual/portals/portal_tracer.h b/servers/visual/portals/portal_tracer.h
index 79277c022..bdc04dec8 100644
--- a/servers/visual/portals/portal_tracer.h
+++ b/servers/visual/portals/portal_tracer.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/bitfield_dynamic.h"
+#include "core/containers/bitfield_dynamic.h"
 #include "core/containers/local_vector.h"
 #include "portal_occlusion_culler.h"
 #include "portal_types.h"
diff --git a/servers/visual/visual_server_scene.h b/servers/visual/visual_server_scene.h
index 272a3cbc1..689290d39 100644
--- a/servers/visual/visual_server_scene.h
+++ b/servers/visual/visual_server_scene.h
@@ -37,7 +37,7 @@
 #include "core/math/octree.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "core/containers/self_list.h"
 #include "portals/portal_renderer.h"
 
diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/visual/visual_server_wrap_mt.h
index 8811e1903..895529921 100644
--- a/servers/visual/visual_server_wrap_mt.h
+++ b/servers/visual/visual_server_wrap_mt.h
@@ -30,9 +30,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/command_queue_mt.h"
+#include "core/containers/command_queue_mt.h"
 #include "core/os/thread.h"
-#include "core/safe_refcount.h"
+#include "core/os/safe_refcount.h"
 #include "servers/visual_server.h"
 
 class VisualServerWrapMT : public VisualServer {
diff --git a/servers/visual_server.h b/servers/visual_server.h
index 968cfe30e..503897c64 100644
--- a/servers/visual_server.h
+++ b/servers/visual_server.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/image.h"
+#include "core/io/image.h"
 #include "core/math/bsp_tree.h"
 #include "core/math/geometry.h"
 #include "core/math/transform_2d.h"