diff --git a/core/SCsub b/core/SCsub
index 456f0a39f..949d13360 100644
--- a/core/SCsub
+++ b/core/SCsub
@@ -189,6 +189,7 @@ env.CommandNoCache(
 # Chain load SCsubs
 SConscript("os/SCsub")
 SConscript("math/SCsub")
+SConscript("containers/SCsub")
 SConscript("crypto/SCsub")
 SConscript("io/SCsub")
 SConscript("log/SCsub")
diff --git a/core/array.cpp b/core/array.cpp
index e5766d762..12d690671 100644
--- a/core/array.cpp
+++ b/core/array.cpp
@@ -30,10 +30,10 @@
 
 #include "array.h"
 
-#include "core/hashfuncs.h"
+#include "core/containers/hashfuncs.h"
 #include "core/object.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class ArrayPrivate {
 public:
diff --git a/core/command_queue_mt.h b/core/command_queue_mt.h
index 5bf620789..b34c315c9 100644
--- a/core/command_queue_mt.h
+++ b/core/command_queue_mt.h
@@ -33,7 +33,7 @@
 #include "core/os/memory.h"
 #include "core/os/mutex.h"
 #include "core/os/semaphore.h"
-#include "core/simple_type.h"
+#include "core/containers/simple_type.h"
 #include "core/typedefs.h"
 
 #define COMMA(N) _COMMA_##N
diff --git a/core/containers/SCsub b/core/containers/SCsub
new file mode 100644
index 000000000..3c5a09560
--- /dev/null
+++ b/core/containers/SCsub
@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+Import("env")
+
+env_containers = env.Clone()
+
+env_containers.add_source_files(env.core_sources, "*.cpp")
diff --git a/core/cowdata.h b/core/containers/cowdata.h
similarity index 100%
rename from core/cowdata.h
rename to core/containers/cowdata.h
diff --git a/core/hash_map.h b/core/containers/hash_map.h
similarity index 99%
rename from core/hash_map.h
rename to core/containers/hash_map.h
index f0450435c..bc9ccde71 100644
--- a/core/hash_map.h
+++ b/core/containers/hash_map.h
@@ -31,8 +31,8 @@
 /*************************************************************************/
 
 #include "core/error_macros.h"
-#include "core/hashfuncs.h"
-#include "core/list.h"
+#include "core/containers/hashfuncs.h"
+#include "core/containers/list.h"
 #include "core/math/math_funcs.h"
 #include "core/os/memory.h"
 #include "core/ustring.h"
diff --git a/core/hash_set.h b/core/containers/hash_set.h
similarity index 99%
rename from core/hash_set.h
rename to core/containers/hash_set.h
index cdeab6ef6..74c6cf64a 100644
--- a/core/hash_set.h
+++ b/core/containers/hash_set.h
@@ -33,8 +33,8 @@
 
 #include "core/math/math_funcs.h"
 #include "core/os/memory.h"
-#include "core/hash_map.h"
-#include "core/hashfuncs.h"
+#include "core/containers/hash_map.h"
+#include "core/containers/hashfuncs.h"
 
 /**
  * Implementation of Set using a bidi indexed hash map.
diff --git a/core/hashfuncs.h b/core/containers/hashfuncs.h
similarity index 100%
rename from core/hashfuncs.h
rename to core/containers/hashfuncs.h
diff --git a/core/list.h b/core/containers/list.h
similarity index 99%
rename from core/list.h
rename to core/containers/list.h
index be8eb4a58..dd6407d91 100644
--- a/core/list.h
+++ b/core/containers/list.h
@@ -32,7 +32,7 @@
 
 #include "core/error_macros.h"
 #include "core/os/memory.h"
-#include "core/sort_array.h"
+#include "core/containers/sort_array.h"
 
 /**
  * Generic Templatized Linked List Implementation.
diff --git a/core/local_vector.h b/core/containers/local_vector.h
similarity index 98%
rename from core/local_vector.h
rename to core/containers/local_vector.h
index 7a9a49c35..2923d9c5b 100644
--- a/core/local_vector.h
+++ b/core/containers/local_vector.h
@@ -32,9 +32,9 @@
 
 #include "core/error_macros.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
-#include "core/sort_array.h"
-#include "core/vector.h"
+#include "core/containers/pool_vector.h"
+#include "core/containers/sort_array.h"
+#include "core/containers/vector.h"
 
 template <class T, class U = uint32_t, bool force_trivial = false>
 class LocalVector {
diff --git a/core/map.h b/core/containers/map.h
similarity index 100%
rename from core/map.h
rename to core/containers/map.h
diff --git a/core/oa_hash_map.h b/core/containers/oa_hash_map.h
similarity index 99%
rename from core/oa_hash_map.h
rename to core/containers/oa_hash_map.h
index 645df147a..c39cac089 100644
--- a/core/oa_hash_map.h
+++ b/core/containers/oa_hash_map.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/hashfuncs.h"
+#include "core/containers/hashfuncs.h"
 #include "core/math/math_funcs.h"
 #include "core/os/memory.h"
 
diff --git a/core/ordered_hash_map.h b/core/containers/ordered_hash_map.h
similarity index 99%
rename from core/ordered_hash_map.h
rename to core/containers/ordered_hash_map.h
index 52757a86e..002c20725 100644
--- a/core/ordered_hash_map.h
+++ b/core/containers/ordered_hash_map.h
@@ -30,8 +30,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/hash_map.h"
-#include "core/list.h"
+#include "core/containers/hash_map.h"
+#include "core/containers/list.h"
 #include "core/pair.h"
 
 /**
diff --git a/core/packed_data_container.cpp b/core/containers/packed_data_container.cpp
similarity index 100%
rename from core/packed_data_container.cpp
rename to core/containers/packed_data_container.cpp
diff --git a/core/packed_data_container.h b/core/containers/packed_data_container.h
similarity index 100%
rename from core/packed_data_container.h
rename to core/containers/packed_data_container.h
diff --git a/core/paged_allocator.h b/core/containers/paged_allocator.h
similarity index 100%
rename from core/paged_allocator.h
rename to core/containers/paged_allocator.h
diff --git a/core/pool_vector.cpp b/core/containers/pool_vector.cpp
similarity index 100%
rename from core/pool_vector.cpp
rename to core/containers/pool_vector.cpp
diff --git a/core/pool_vector.h b/core/containers/pool_vector.h
similarity index 100%
rename from core/pool_vector.h
rename to core/containers/pool_vector.h
diff --git a/core/pooled_list.h b/core/containers/pooled_list.h
similarity index 99%
rename from core/pooled_list.h
rename to core/containers/pooled_list.h
index 281d92a67..f53cbbf9d 100644
--- a/core/pooled_list.h
+++ b/core/containers/pooled_list.h
@@ -52,7 +52,7 @@
 // Compaction can be done but would rely on a more complex method
 // of preferentially giving out lower IDs in the freelist first.
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 
 template <class T, class U = uint32_t, bool force_trivial = false, bool zero_on_first_request = false>
 class PooledList {
diff --git a/core/rb_map.h b/core/containers/rb_map.h
similarity index 100%
rename from core/rb_map.h
rename to core/containers/rb_map.h
diff --git a/core/rb_set.h b/core/containers/rb_set.h
similarity index 100%
rename from core/rb_set.h
rename to core/containers/rb_set.h
diff --git a/core/ring_buffer.h b/core/containers/ring_buffer.h
similarity index 99%
rename from core/ring_buffer.h
rename to core/containers/ring_buffer.h
index 5563d754b..f3545beaa 100644
--- a/core/ring_buffer.h
+++ b/core/containers/ring_buffer.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 template <typename T>
 class RingBuffer {
diff --git a/core/self_list.h b/core/containers/self_list.h
similarity index 100%
rename from core/self_list.h
rename to core/containers/self_list.h
diff --git a/core/set.h b/core/containers/set.h
similarity index 100%
rename from core/set.h
rename to core/containers/set.h
diff --git a/core/simple_type.h b/core/containers/simple_type.h
similarity index 100%
rename from core/simple_type.h
rename to core/containers/simple_type.h
diff --git a/core/sort_array.h b/core/containers/sort_array.h
similarity index 100%
rename from core/sort_array.h
rename to core/containers/sort_array.h
diff --git a/core/threaded_callable_queue.h b/core/containers/threaded_callable_queue.h
similarity index 97%
rename from core/threaded_callable_queue.h
rename to core/containers/threaded_callable_queue.h
index 9649f41a0..24bbc9fed 100644
--- a/core/threaded_callable_queue.h
+++ b/core/containers/threaded_callable_queue.h
@@ -30,8 +30,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/local_vector.h"
-#include "core/ordered_hash_map.h"
+#include "core/containers/local_vector.h"
+#include "core/containers/ordered_hash_map.h"
 #include "core/os/mutex.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
diff --git a/core/vector.h b/core/containers/vector.h
similarity index 98%
rename from core/vector.h
rename to core/containers/vector.h
index fef2816d2..e82ed5768 100644
--- a/core/vector.h
+++ b/core/containers/vector.h
@@ -36,10 +36,10 @@
  * Vector container. Regular Vector Container. Use with care and for smaller arrays when possible. Use PoolVector for large arrays.
  */
 
-#include "core/cowdata.h"
+#include "core/containers/cowdata.h"
 #include "core/error_macros.h"
 #include "core/os/memory.h"
-#include "core/sort_array.h"
+#include "core/containers/sort_array.h"
 
 template <class T>
 class VectorWriteProxy {
diff --git a/core/vmap.h b/core/containers/vmap.h
similarity index 99%
rename from core/vmap.h
rename to core/containers/vmap.h
index 5289b6398..955c05f47 100644
--- a/core/vmap.h
+++ b/core/containers/vmap.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/cowdata.h"
+#include "core/containers/cowdata.h"
 #include "core/typedefs.h"
 
 template <class T, class V>
diff --git a/core/vset.h b/core/containers/vset.h
similarity index 99%
rename from core/vset.h
rename to core/containers/vset.h
index c819c2bca..ad4607141 100644
--- a/core/vset.h
+++ b/core/containers/vset.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/typedefs.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 template <class T>
 class VSet {
diff --git a/core/dictionary.cpp b/core/dictionary.cpp
index 5bdc705eb..8715f6842 100644
--- a/core/dictionary.cpp
+++ b/core/dictionary.cpp
@@ -30,7 +30,7 @@
 
 #include "dictionary.h"
 
-#include "core/ordered_hash_map.h"
+#include "core/containers/ordered_hash_map.h"
 #include "core/safe_refcount.h"
 #include "core/variant.h"
 
diff --git a/core/dictionary.h b/core/dictionary.h
index 5f8066d32..113f6fab5 100644
--- a/core/dictionary.h
+++ b/core/dictionary.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/array.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/ustring.h"
 
 class Variant;
diff --git a/core/engine.h b/core/engine.h
index 0a4d25c60..f14746c52 100644
--- a/core/engine.h
+++ b/core/engine.h
@@ -30,10 +30,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/os/main_loop.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Engine {
 public:
diff --git a/core/image.cpp b/core/image.cpp
index 741e61806..463198fff 100644
--- a/core/image.cpp
+++ b/core/image.cpp
@@ -31,7 +31,7 @@
 #include "image.h"
 
 #include "core/error_macros.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/io/image_loader.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_funcs.h"
diff --git a/core/image.h b/core/image.h
index f214c3a49..ba4f7b3de 100644
--- a/core/image.h
+++ b/core/image.h
@@ -32,7 +32,7 @@
 
 #include "core/math/color.h"
 #include "core/math/rect2.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/resource.h"
 
 /**
diff --git a/core/io/compression.h b/core/io/compression.h
index 7e0afcb5b..127bffc8f 100644
--- a/core/io/compression.h
+++ b/core/io/compression.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/typedefs.h"
 
 class Compression {
diff --git a/core/io/config_file.h b/core/io/config_file.h
index eae89e32f..40bd279f9 100644
--- a/core/io/config_file.h
+++ b/core/io/config_file.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/ordered_hash_map.h"
+#include "core/containers/ordered_hash_map.h"
 #include "core/os/file_access.h"
 #include "core/reference.h"
 #include "core/variant_parser.h"
diff --git a/core/io/file_access_memory.cpp b/core/io/file_access_memory.cpp
index 5821220fa..7cb2ea3e4 100644
--- a/core/io/file_access_memory.cpp
+++ b/core/io/file_access_memory.cpp
@@ -30,7 +30,7 @@
 
 #include "file_access_memory.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/os/dir_access.h"
 #include "core/project_settings.h"
 
diff --git a/core/io/file_access_pack.h b/core/io/file_access_pack.h
index 79dbcf2e6..fc7e54360 100644
--- a/core/io/file_access_pack.h
+++ b/core/io/file_access_pack.h
@@ -30,13 +30,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
 #include "core/print_string.h"
-#include "core/set.h"
-#include "core/hashfuncs.h"
+#include "core/containers/set.h"
+#include "core/containers/hashfuncs.h"
 
 // Pandemonium's packed file magic header ("GDPC" in ASCII).
 #define PACK_HEADER_MAGIC 0x43504447
diff --git a/core/io/file_access_zip.h b/core/io/file_access_zip.h
index 90627fb97..de2883572 100644
--- a/core/io/file_access_zip.h
+++ b/core/io/file_access_zip.h
@@ -33,7 +33,7 @@
 #ifdef MINIZIP_ENABLED
 
 #include "core/io/file_access_pack.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 
 #include "thirdparty/minizip/unzip.h"
 
diff --git a/core/io/image_loader.h b/core/io/image_loader.h
index 843e03a59..401e1fac3 100644
--- a/core/io/image_loader.h
+++ b/core/io/image_loader.h
@@ -32,7 +32,7 @@
 
 #include "core/image.h"
 #include "core/io/resource_loader.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/os/file_access.h"
 #include "core/ustring.h"
 
diff --git a/core/io/ip.cpp b/core/io/ip.cpp
index cbe76aaea..a52b64953 100644
--- a/core/io/ip.cpp
+++ b/core/io/ip.cpp
@@ -30,7 +30,7 @@
 
 #include "ip.h"
 
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
 
diff --git a/core/io/logger.h b/core/io/logger.h
index fd7acbe2a..10787b582 100644
--- a/core/io/logger.h
+++ b/core/io/logger.h
@@ -32,7 +32,7 @@
 
 #include "core/os/file_access.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include <stdarg.h>
 
diff --git a/core/io/packet_peer.h b/core/io/packet_peer.h
index 89342e020..b7d336deb 100644
--- a/core/io/packet_peer.h
+++ b/core/io/packet_peer.h
@@ -32,7 +32,7 @@
 
 #include "core/io/stream_peer.h"
 #include "core/object.h"
-#include "core/ring_buffer.h"
+#include "core/containers/ring_buffer.h"
 
 class PacketPeer : public Reference {
 	GDCLASS(PacketPeer, Reference);
diff --git a/core/io/xml_parser.h b/core/io/xml_parser.h
index fbe3363af..3c857a8f4 100644
--- a/core/io/xml_parser.h
+++ b/core/io/xml_parser.h
@@ -33,7 +33,7 @@
 #include "core/os/file_access.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 /*
   Based on irrXML (see their zlib license). Added mainly for compatibility with their Collada loader.
diff --git a/core/math/a_star.h b/core/math/a_star.h
index a7ba97cc1..e318a8ac5 100644
--- a/core/math/a_star.h
+++ b/core/math/a_star.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/oa_hash_map.h"
+#include "core/containers/oa_hash_map.h"
 #include "core/reference.h"
 
 /**
diff --git a/core/math/bsp_tree.h b/core/math/bsp_tree.h
index 58a5a9947..f17c50036 100644
--- a/core/math/bsp_tree.h
+++ b/core/math/bsp_tree.h
@@ -34,9 +34,9 @@
 #include "core/math/face3.h"
 #include "core/math/plane.h"
 #include "core/method_ptrcall.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class BSP_Tree {
 public:
diff --git a/core/math/bvh_tree.h b/core/math/bvh_tree.h
index 05984ae41..9e700c390 100644
--- a/core/math/bvh_tree.h
+++ b/core/math/bvh_tree.h
@@ -38,12 +38,12 @@
 // to a simpler tree.
 // Note that MAX_CHILDREN should be fixed at 2 for now.
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/math/aabb.h"
 #include "core/math/bvh_abb.h"
 #include "core/math/geometry.h"
 #include "core/math/vector3.h"
-#include "core/pooled_list.h"
+#include "core/containers/pooled_list.h"
 #include "core/print_string.h"
 #include <limits.h>
 
diff --git a/core/math/color.cpp b/core/math/color.cpp
index e35656536..4ce322b55 100644
--- a/core/math/color.cpp
+++ b/core/math/color.cpp
@@ -31,7 +31,7 @@
 #include "color.h"
 
 #include "core/math/color_names.inc"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/math_funcs.h"
 #include "core/print_string.h"
 
diff --git a/core/math/color_names.inc b/core/math/color_names.inc
index 2b50d88b0..5e6e431a6 100644
--- a/core/math/color_names.inc
+++ b/core/math/color_names.inc
@@ -1,5 +1,5 @@
 // Names from https://en.wikipedia.org/wiki/X11_color_names
-#include "core/map.h"
+#include "core/containers/map.h"
 
 static Map<String, Color> _named_colors;
 static void _populate_named_colors() {
diff --git a/core/math/convex_hull.cpp b/core/math/convex_hull.cpp
index bac3534a7..ff220f831 100644
--- a/core/math/convex_hull.cpp
+++ b/core/math/convex_hull.cpp
@@ -62,7 +62,7 @@ subject to the following restrictions:
 #include "core/math/aabb.h"
 #include "core/math/math_defs.h"
 #include "core/os/memory.h"
-#include "core/paged_allocator.h"
+#include "core/containers/paged_allocator.h"
 
 #include <string.h>
 
diff --git a/core/math/convex_hull.h b/core/math/convex_hull.h
index fad3c50b3..f710ac6df 100644
--- a/core/math/convex_hull.h
+++ b/core/math/convex_hull.h
@@ -44,10 +44,10 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/math/geometry.h"
 #include "core/math/vector3.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 /// Convex hull implementation based on Preparata and Hong
 /// See http://code.google.com/p/bullet/issues/detail?id=275
diff --git a/core/math/delaunay.h b/core/math/delaunay.h
index 3788d6d36..2698ca303 100644
--- a/core/math/delaunay.h
+++ b/core/math/delaunay.h
@@ -32,7 +32,7 @@
 
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Delaunay2D {
 public:
diff --git a/core/math/disjoint_set.h b/core/math/disjoint_set.h
index fdedb85c7..f469ac938 100644
--- a/core/math/disjoint_set.h
+++ b/core/math/disjoint_set.h
@@ -30,8 +30,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/map.h"
-#include "core/vector.h"
+#include "core/containers/map.h"
+#include "core/containers/vector.h"
 
 /**
 	@author Marios Staikopoulos <marios@staik.net>
diff --git a/core/math/geometry.cpp b/core/math/geometry.cpp
index e146259bd..2a86d34cf 100644
--- a/core/math/geometry.cpp
+++ b/core/math/geometry.cpp
@@ -30,7 +30,7 @@
 
 #include "geometry.h"
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/print_string.h"
 
 #include "thirdparty/misc/clipper.hpp"
diff --git a/core/math/geometry.h b/core/math/geometry.h
index b3ccb8d80..56add205e 100644
--- a/core/math/geometry.h
+++ b/core/math/geometry.h
@@ -37,9 +37,9 @@
 #include "core/math/vector3.h"
 #include "core/math/vector2i.h"
 #include "core/object.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/print_string.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Geometry {
 public:
diff --git a/core/math/octree_definition.inc b/core/math/octree_definition.inc
index b365e272c..20ade86b4 100644
--- a/core/math/octree_definition.inc
+++ b/core/math/octree_definition.inc
@@ -31,9 +31,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
-#include "core/local_vector.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/local_vector.h"
+#include "core/containers/map.h"
 #include "core/math/aabb.h"
 #include "core/math/geometry.h"
 #include "core/math/vector3.h"
diff --git a/core/math/projection.h b/core/math/projection.h
index 10794b0a8..1fe819f42 100644
--- a/core/math/projection.h
+++ b/core/math/projection.h
@@ -34,7 +34,7 @@
 #include "core/math/math_defs.h"
 #include "core/math/vector3.h"
 #include "core/math/vector4.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Array;
 struct AABB;
diff --git a/core/math/quick_hull.cpp b/core/math/quick_hull.cpp
index 8bbba3262..344bb83ef 100644
--- a/core/math/quick_hull.cpp
+++ b/core/math/quick_hull.cpp
@@ -30,7 +30,7 @@
 
 #include "quick_hull.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 
 uint32_t QuickHull::debug_stop_after = 0xFFFFFFFF;
 bool QuickHull::_flag_warnings = true;
diff --git a/core/math/quick_hull.h b/core/math/quick_hull.h
index 5d3cd7d11..78601e1e5 100644
--- a/core/math/quick_hull.h
+++ b/core/math/quick_hull.h
@@ -30,10 +30,10 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/aabb.h"
 #include "core/math/geometry.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 
 class QuickHull {
 public:
diff --git a/core/math/transform.h b/core/math/transform.h
index 079acb735..73085bc70 100644
--- a/core/math/transform.h
+++ b/core/math/transform.h
@@ -34,7 +34,7 @@
 #include "core/math/basis.h"
 #include "core/math/plane.h"
 #include "core/math/vector3i.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 struct _NO_DISCARD_CLASS_ Transform {
 	Basis basis;
diff --git a/core/math/transform_2d.h b/core/math/transform_2d.h
index c24a30b8b..9f25aeef0 100644
--- a/core/math/transform_2d.h
+++ b/core/math/transform_2d.h
@@ -32,7 +32,7 @@
 
 #include "core/math/rect2.h" // also includes vector2, math_funcs, and ustring
 #include "core/math/rect2i.h" // also includes vector2i, math_funcs, and ustring
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 struct _NO_DISCARD_CLASS_ Transform2D {
 	// Warning #1: basis of Transform2D is stored differently from Basis. In terms of columns array, the basis matrix looks like "on paper":
diff --git a/core/math/triangle_mesh.cpp b/core/math/triangle_mesh.cpp
index b12420f25..36726ad4f 100644
--- a/core/math/triangle_mesh.cpp
+++ b/core/math/triangle_mesh.cpp
@@ -30,7 +30,7 @@
 
 #include "triangle_mesh.h"
 
-#include "core/sort_array.h"
+#include "core/containers/sort_array.h"
 
 int TriangleMesh::_create_bvh(BVH *p_bvh, BVH **p_bb, int p_from, int p_size, int p_depth, int &max_depth, int &max_alloc) {
 	if (p_depth > max_depth) {
diff --git a/core/math/triangulate.h b/core/math/triangulate.h
index 7712a8d3a..dec99cb36 100644
--- a/core/math/triangulate.h
+++ b/core/math/triangulate.h
@@ -32,7 +32,7 @@
 
 #include "core/math/vector2.h"
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 /*
 http://www.flipcode.com/archives/Efficient_Polygon_Triangulation.shtml
diff --git a/core/method_bind.h b/core/method_bind.h
index 6575bd4a8..057b8a68a 100644
--- a/core/method_bind.h
+++ b/core/method_bind.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/method_ptrcall.h"
 #include "core/object.h"
 #include "core/variant.h"
diff --git a/core/object.h b/core/object.h
index 8bdbc32ac..26d579da9 100644
--- a/core/object.h
+++ b/core/object.h
@@ -30,15 +30,15 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/hash_map.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/hash_map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/object_id.h"
 #include "core/os/rw_lock.h"
 #include "core/safe_refcount.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/variant.h"
-#include "core/vmap.h"
+#include "core/containers/vmap.h"
 
 #include <atomic>
 
diff --git a/core/os/os.h b/core/os/os.h
index e167c704d..d6f09dfb4 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -33,10 +33,10 @@
 #include "core/engine.h"
 #include "core/image.h"
 #include "core/io/logger.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/os/main_loop.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/core/pair.h b/core/pair.h
index 31a95c2f5..828ec6e68 100644
--- a/core/pair.h
+++ b/core/pair.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/hashfuncs.h"
+#include "core/containers/hashfuncs.h"
 #include "core/typedefs.h"
 
 template <class F, class S>
diff --git a/core/project_settings.h b/core/project_settings.h
index 90d0df2fc..0fcee0d0f 100644
--- a/core/project_settings.h
+++ b/core/project_settings.h
@@ -32,7 +32,7 @@
 
 #include "core/object.h"
 #include "core/os/thread_safe.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 
 // Querying ProjectSettings is usually done at startup.
 // Additionally, in order to keep track of changes to ProjectSettings,
diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp
index 71b30a3b6..27448e97a 100644
--- a/core/register_core_types.cpp
+++ b/core/register_core_types.cpp
@@ -68,7 +68,7 @@
 #include "core/os/input.h"
 #include "core/os/main_loop.h"
 #include "core/os/time.h"
-#include "core/packed_data_container.h"
+#include "core/containers/packed_data_container.h"
 #include "core/path_remap.h"
 #include "core/project_settings.h"
 #include "core/translation.h"
diff --git a/core/resource.h b/core/resource.h
index a40c5ce89..156817a64 100644
--- a/core/resource.h
+++ b/core/resource.h
@@ -35,7 +35,7 @@
 #include "core/ref_ptr.h"
 #include "core/reference.h"
 #include "core/safe_refcount.h"
-#include "core/self_list.h"
+#include "core/containers/self_list.h"
 
 #define RES_BASE_EXTENSION(m_ext)                                                                                   \
 public:                                                                                                             \
diff --git a/core/rid.h b/core/rid.h
index 7cbfc855b..c5daf3b7d 100644
--- a/core/rid.h
+++ b/core/rid.h
@@ -30,11 +30,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/os/memory.h"
 #include "core/rid_handle.h"
 #include "core/safe_refcount.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/typedefs.h"
 
 #ifndef RID_HANDLES_ENABLED
diff --git a/core/rid_handle.h b/core/rid_handle.h
index 6a0a582ba..9e1d3a656 100644
--- a/core/rid_handle.h
+++ b/core/rid_handle.h
@@ -30,9 +30,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/os/mutex.h"
-#include "core/pooled_list.h"
+#include "core/containers/pooled_list.h"
 #include "core/safe_refcount.h"
 #include "core/typedefs.h"
 
diff --git a/core/script_debugger_local.h b/core/script_debugger_local.h
index 8765a9820..010c03d11 100644
--- a/core/script_debugger_local.h
+++ b/core/script_debugger_local.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/script_language.h"
 
 class ScriptDebuggerLocal : public ScriptDebugger {
diff --git a/core/script_language.h b/core/script_language.h
index 347d2583e..c0702fd4d 100644
--- a/core/script_language.h
+++ b/core/script_language.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/io/multiplayer_api.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/pair.h"
 #include "core/resource.h"
 
diff --git a/core/string_builder.h b/core/string_builder.h
index eacf78490..55866111a 100644
--- a/core/string_builder.h
+++ b/core/string_builder.h
@@ -32,7 +32,7 @@
 
 #include "core/ustring.h"
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class StringBuilder {
 	uint32_t string_length;
diff --git a/core/ustring.h b/core/ustring.h
index 42d69f2c0..36a1b3541 100644
--- a/core/ustring.h
+++ b/core/ustring.h
@@ -32,9 +32,9 @@
 
 #include "core/array.h"
 #include "core/char_utils.h"
-#include "core/cowdata.h"
+#include "core/containers/cowdata.h"
 #include "core/typedefs.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 /*************************************************************************/
 /*  CharProxy                                                            */
diff --git a/core/variant.h b/core/variant.h
index 053d4e652..6c621be3b 100644
--- a/core/variant.h
+++ b/core/variant.h
@@ -48,7 +48,7 @@
 #include "core/math/vector4i.h"
 #include "core/node_path.h"
 #include "core/object_id.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/ref_ptr.h"
 #include "core/rid.h"
 #include "core/ustring.h"
diff --git a/drivers/alsamidi/midi_driver_alsamidi.h b/drivers/alsamidi/midi_driver_alsamidi.h
index 3fe957bc4..653664d8a 100644
--- a/drivers/alsamidi/midi_driver_alsamidi.h
+++ b/drivers/alsamidi/midi_driver_alsamidi.h
@@ -35,7 +35,7 @@
 #include "core/os/midi_driver.h"
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../alsa/asound-so_wrap.h"
 #include <stdio.h>
diff --git a/drivers/coremidi/midi_driver_coremidi.h b/drivers/coremidi/midi_driver_coremidi.h
index 1433582fd..5d6488cdd 100644
--- a/drivers/coremidi/midi_driver_coremidi.h
+++ b/drivers/coremidi/midi_driver_coremidi.h
@@ -33,7 +33,7 @@
 #ifdef COREMIDI_ENABLED
 
 #include "core/os/midi_driver.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include <CoreMIDI/CoreMIDI.h>
 #include <stdio.h>
diff --git a/drivers/dummy/rasterizer_dummy.h b/drivers/dummy/rasterizer_dummy.h
index 44d66b0d0..e94026715 100644
--- a/drivers/dummy/rasterizer_dummy.h
+++ b/drivers/dummy/rasterizer_dummy.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/math/projection.h"
-#include "core/self_list.h"
+#include "core/containers/self_list.h"
 #include "scene/resources/mesh.h"
 #include "servers/visual/rasterizer.h"
 #include "servers/visual_server.h"
diff --git a/drivers/gles2/rasterizer_scene_gles2.cpp b/drivers/gles2/rasterizer_scene_gles2.cpp
index 57ef95196..43922f530 100644
--- a/drivers/gles2/rasterizer_scene_gles2.cpp
+++ b/drivers/gles2/rasterizer_scene_gles2.cpp
@@ -34,7 +34,7 @@
 #include "core/math/transform.h"
 #include "core/os/os.h"
 #include "core/project_settings.h"
-#include "core/vmap.h"
+#include "core/containers/vmap.h"
 #include "rasterizer_canvas_gles2.h"
 #include "servers/visual/visual_server_raster.h"
 
diff --git a/drivers/gles2/rasterizer_storage_gles2.h b/drivers/gles2/rasterizer_storage_gles2.h
index 7d6085f0e..408932f16 100644
--- a/drivers/gles2/rasterizer_storage_gles2.h
+++ b/drivers/gles2/rasterizer_storage_gles2.h
@@ -30,8 +30,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/pool_vector.h"
-#include "core/self_list.h"
+#include "core/containers/pool_vector.h"
+#include "core/containers/self_list.h"
 #include "drivers/gles_common/rasterizer_asserts.h"
 #include "servers/visual/rasterizer.h"
 #include "servers/visual/shader_language.h"
diff --git a/drivers/gles2/shader_gles2.h b/drivers/gles2/shader_gles2.h
index d306193c5..08fe9dcc2 100644
--- a/drivers/gles2/shader_gles2.h
+++ b/drivers/gles2/shader_gles2.h
@@ -38,8 +38,8 @@
 #include GLES2_INCLUDE_H
 #endif
 
-#include "core/hash_map.h"
-#include "core/map.h"
+#include "core/containers/hash_map.h"
+#include "core/containers/map.h"
 #include "core/math/projection.h"
 #include "core/pair.h"
 #include "core/variant.h"
diff --git a/drivers/gles_common/rasterizer_array.h b/drivers/gles_common/rasterizer_array.h
index 86878149d..d3d576335 100644
--- a/drivers/gles_common/rasterizer_array.h
+++ b/drivers/gles_common/rasterizer_array.h
@@ -37,7 +37,7 @@
  */
 
 #include "core/os/memory.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include <string.h>
 
diff --git a/drivers/png/png_driver_common.h b/drivers/png/png_driver_common.h
index 7a3bf5252..c55b3aad7 100644
--- a/drivers/png/png_driver_common.h
+++ b/drivers/png/png_driver_common.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/image.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 namespace PNGDriverCommon {
 
diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp
index fdb0c7bcb..14f08a181 100644
--- a/drivers/unix/dir_access_unix.cpp
+++ b/drivers/unix/dir_access_unix.cpp
@@ -32,7 +32,7 @@
 
 #if defined(UNIX_ENABLED) || defined(LIBC_FILEIO_ENABLED)
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/os/memory.h"
 #include "core/print_string.h"
 
diff --git a/drivers/winmidi/midi_driver_winmidi.h b/drivers/winmidi/midi_driver_winmidi.h
index 246d1fbda..e961c9644 100644
--- a/drivers/winmidi/midi_driver_winmidi.h
+++ b/drivers/winmidi/midi_driver_winmidi.h
@@ -33,7 +33,7 @@
 #ifdef WINMIDI_ENABLED
 
 #include "core/os/midi_driver.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include <stdio.h>
 #define WIN32_LEAN_AND_MEAN
diff --git a/editor/animation_bezier_editor.cpp b/editor/animation_bezier_editor.cpp
index d01f7f051..131147677 100644
--- a/editor/animation_bezier_editor.cpp
+++ b/editor/animation_bezier_editor.cpp
@@ -36,7 +36,7 @@
 #include "core/class_db.h"
 #include "core/math/color.h"
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/transform_2d.h"
diff --git a/editor/animation_bezier_editor.h b/editor/animation_bezier_editor.h
index aa6aa1872..21f1bdcde 100644
--- a/editor/animation_bezier_editor.h
+++ b/editor/animation_bezier_editor.h
@@ -32,15 +32,15 @@
 
 #include "scene/gui/control.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/reference.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/resources/animation.h"
 #include "scene/resources/texture.h"
diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp
index 764e37f85..b28cd0333 100644
--- a/editor/animation_track_editor.cpp
+++ b/editor/animation_track_editor.cpp
@@ -49,7 +49,7 @@
 #include "core/pair.h"
 #include "core/resource.h"
 #include "core/script_language.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/undo_redo.h"
diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h
index d34ac2c22..640ce4920 100644
--- a/editor/animation_track_editor.h
+++ b/editor/animation_track_editor.h
@@ -38,15 +38,15 @@
 #include "scene/gui/slider.h"
 
 #include "core/dictionary.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
 #include "core/node_path.h"
 #include "core/object.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/resources/animation.h"
 #include "scene/resources/texture.h"
 
diff --git a/editor/animation_track_editor_plugins.cpp b/editor/animation_track_editor_plugins.cpp
index 448af3da9..e0c06b01a 100644
--- a/editor/animation_track_editor_plugins.cpp
+++ b/editor/animation_track_editor_plugins.cpp
@@ -41,7 +41,7 @@
 #include "core/math/color.h"
 #include "core/dictionary.h"
 #include "core/io/resource_loader.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/math_funcs.h"
 #include "core/node_path.h"
 #include "core/os/input_event.h"
@@ -49,7 +49,7 @@
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/undo_redo.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/resources/animation.h"
 #include "scene/resources/font.h"
 #include "servers/visual_server.h"
diff --git a/editor/array_property_edit.h b/editor/array_property_edit.h
index 15221eeec..ec2ad6cef 100644
--- a/editor/array_property_edit.h
+++ b/editor/array_property_edit.h
@@ -32,7 +32,7 @@
 
 #include "scene/main/node.h"
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/object.h"
 #include "core/object_id.h"
 #include "core/reference.h"
diff --git a/editor/audio_stream_preview.cpp b/editor/audio_stream_preview.cpp
index b7c5a3188..331121c9f 100644
--- a/editor/audio_stream_preview.cpp
+++ b/editor/audio_stream_preview.cpp
@@ -32,7 +32,7 @@
 
 #include "core/class_db.h"
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/audio_frame.h"
 #include "core/os/memory.h"
 #include "core/os/thread.h"
diff --git a/editor/audio_stream_preview.h b/editor/audio_stream_preview.h
index f0ffae962..9b87c168a 100644
--- a/editor/audio_stream_preview.h
+++ b/editor/audio_stream_preview.h
@@ -36,11 +36,11 @@
 #include "scene/main/node.h"
 #include "servers/audio/audio_stream.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/object.h"
 #include "core/object_id.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Thread;
 
diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp
index 5ff6ccc8b..88bdb342b 100644
--- a/editor/code_editor.cpp
+++ b/editor/code_editor.cpp
@@ -43,7 +43,7 @@
 #include "core/script_language.h"
 #include "core/string_builder.h"
 #include "core/typedefs.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "editor/editor_scale.h"
 #include "editor/plugins/script_editor_plugin.h"
 #include "editor_node.h"
diff --git a/editor/code_editor.h b/editor/code_editor.h
index 1616408fa..696f01856 100644
--- a/editor/code_editor.h
+++ b/editor/code_editor.h
@@ -33,7 +33,7 @@
 #include "scene/gui/dialogs.h"
 #include "scene/gui/box_container.h"
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/math_defs.h"
 #include "core/object.h"
 #include "core/reference.h"
diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp
index 089e1f720..856cddde7 100644
--- a/editor/connections_dialog.cpp
+++ b/editor/connections_dialog.cpp
@@ -34,7 +34,7 @@
 #include "core/math/color.h"
 #include "core/dictionary.h"
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/aabb.h"
 #include "core/math/basis.h"
 #include "core/math/plane.h"
diff --git a/editor/connections_dialog.h b/editor/connections_dialog.h
index 39ed6031d..fa30da9e7 100644
--- a/editor/connections_dialog.h
+++ b/editor/connections_dialog.h
@@ -39,12 +39,12 @@
 #include "scene/gui/box_container.h"
 
 #include "core/undo_redo.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/node_path.h"
 #include "core/object.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class PopupMenu;
 class ConnectDialogBinds;
diff --git a/editor/create_dialog.cpp b/editor/create_dialog.cpp
index 30bed3ced..5ef64b89a 100644
--- a/editor/create_dialog.cpp
+++ b/editor/create_dialog.cpp
@@ -39,7 +39,7 @@
 #include "scene/gui/box_container.h"
 #include "core/math/color.h"
 #include "core/dictionary.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/rect2.h"
 #include "core/os/file_access.h"
 #include "core/os/input_event.h"
diff --git a/editor/create_dialog.h b/editor/create_dialog.h
index e8f34fd91..d8e4c8f4f 100644
--- a/editor/create_dialog.h
+++ b/editor/create_dialog.h
@@ -32,17 +32,17 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "core/hash_map.h"
-#include "core/list.h"
+#include "core/containers/hash_map.h"
+#include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/resource.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Button;
 class Control;
diff --git a/editor/dependency_editor.h b/editor/dependency_editor.h
index 7730d103b..2ebe65920 100644
--- a/editor/dependency_editor.h
+++ b/editor/dependency_editor.h
@@ -32,12 +32,12 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "core/hash_map.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/hash_map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/object.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class EditorFileDialog;
 class EditorFileSystemDirectory;
diff --git a/editor/dictionary_property_edit.h b/editor/dictionary_property_edit.h
index 32db82803..81d669cd7 100644
--- a/editor/dictionary_property_edit.h
+++ b/editor/dictionary_property_edit.h
@@ -32,7 +32,7 @@
 
 #include "scene/main/node.h"
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/object.h"
 #include "core/object_id.h"
 #include "core/reference.h"
diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp
index 79497ee79..3f7aa172e 100644
--- a/editor/doc/doc_data.cpp
+++ b/editor/doc/doc_data.cpp
@@ -42,14 +42,14 @@
 #include "core/io/xml_parser.h"
 #include "core/class_db.h"
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/method_bind.h"
 #include "core/object.h"
 #include "core/os/file_access.h"
 #include "core/os/memory.h"
 #include "core/pair.h"
 #include "core/print_string.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/variant.h"
diff --git a/editor/doc/doc_data.h b/editor/doc/doc_data.h
index a8f332e03..6580fe5a8 100644
--- a/editor/doc/doc_data.h
+++ b/editor/doc/doc_data.h
@@ -30,12 +30,12 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/variant.h"
 #include "core/reference.h"
 #include "core/error_list.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class XMLParser;
 
diff --git a/editor/editor_about.h b/editor/editor_about.h
index 0e9f0dd53..865ed5058 100644
--- a/editor/editor_about.h
+++ b/editor/editor_about.h
@@ -32,7 +32,7 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/object.h"
 #include "core/ustring.h"
 
diff --git a/editor/editor_atlas_packer.h b/editor/editor_atlas_packer.h
index a165172aa..213bb9f19 100644
--- a/editor/editor_atlas_packer.h
+++ b/editor/editor_atlas_packer.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/math/vector2.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/resources/bit_map.h"
 #include "core/reference.h"
 
diff --git a/editor/editor_audio_buses.h b/editor/editor_audio_buses.h
index 47f22459d..91c16e8fe 100644
--- a/editor/editor_audio_buses.h
+++ b/editor/editor_audio_buses.h
@@ -38,7 +38,7 @@
 #include "scene/gui/line_edit.h"
 
 #include "core/math/color.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/reference.h"
diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp
index 67de73926..bf42f730c 100644
--- a/editor/editor_autoload_settings.cpp
+++ b/editor/editor_autoload_settings.cpp
@@ -42,18 +42,18 @@
 #include "core/dictionary.h"
 #include "core/error_macros.h"
 #include "core/io/resource_loader.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/math_funcs.h"
 #include "core/os/file_access.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
 #include "core/resource.h"
 #include "core/script_language.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/undo_redo.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "editor/editor_file_dialog.h"
 #include "scene/gui/button.h"
 #include "scene/gui/control.h"
diff --git a/editor/editor_autoload_settings.h b/editor/editor_autoload_settings.h
index 3db2017be..dc3fa886f 100644
--- a/editor/editor_autoload_settings.h
+++ b/editor/editor_autoload_settings.h
@@ -32,7 +32,7 @@
 
 #include "scene/gui/box_container.h"
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/ustring.h"
diff --git a/editor/editor_data.h b/editor/editor_data.h
index ff06c50f1..e68caad6c 100644
--- a/editor/editor_data.h
+++ b/editor/editor_data.h
@@ -35,23 +35,23 @@
 #include "editor/plugins/script_editor_plugin.h"
 #include "scene/resources/texture.h"
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/pair.h"
 #include "core/undo_redo.h"
 #include "core/array.h"
 #include "core/dictionary.h"
-#include "core/hash_map.h"
-#include "core/map.h"
+#include "core/containers/hash_map.h"
+#include "core/containers/map.h"
 #include "core/node_path.h"
 #include "core/object_id.h"
 #include "core/reference.h"
 #include "core/script_language.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class ConfigFile;
 class EditorPlugin;
diff --git a/editor/editor_dir_dialog.h b/editor/editor_dir_dialog.h
index a7cb1c62c..e94dcaa53 100644
--- a/editor/editor_dir_dialog.h
+++ b/editor/editor_dir_dialog.h
@@ -34,7 +34,7 @@
 
 #include "core/os/dir_access.h"
 #include "core/object.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/ustring.h"
 
 class Button;
diff --git a/editor/editor_export.h b/editor/editor_export.h
index 6434b3a0d..7d728a358 100644
--- a/editor/editor_export.h
+++ b/editor/editor_export.h
@@ -38,17 +38,17 @@
 #include "scene/resources/texture.h"
 
 #include "core/error_list.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/object.h"
 #include "core/os/dir_access.h"
-#include "core/pool_vector.h"
-#include "core/set.h"
+#include "core/containers/pool_vector.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class FileAccess;
 class EditorExportPlatform;
diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp
index 5e764b4c8..b4a60814e 100644
--- a/editor/editor_file_dialog.cpp
+++ b/editor/editor_file_dialog.cpp
@@ -35,7 +35,7 @@
 #include "core/dictionary.h"
 #include "core/error_list.h"
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/os/dir_access.h"
 #include "core/os/file_access.h"
@@ -43,7 +43,7 @@
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/project_settings.h"
 #include "core/typedefs.h"
 #include "dependency_editor.h"
diff --git a/editor/editor_file_dialog.h b/editor/editor_file_dialog.h
index 6edfe6e76..0680bca72 100644
--- a/editor/editor_file_dialog.h
+++ b/editor/editor_file_dialog.h
@@ -42,7 +42,7 @@
 #include "core/reference.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class DependencyRemoveDialog;
 class Button;
diff --git a/editor/editor_file_system.h b/editor/editor_file_system.h
index b2be42a27..010ca447b 100644
--- a/editor/editor_file_system.h
+++ b/editor/editor_file_system.h
@@ -37,14 +37,14 @@
 #include "core/os/thread.h"
 #include "core/os/thread_safe.h"
 #include "core/safe_refcount.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/error_list.h"
-#include "core/hash_map.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/hash_map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class FileAccess;
 struct EditorProgressBG;
diff --git a/editor/editor_folding.cpp b/editor/editor_folding.cpp
index e9ab6d97e..40118a5b4 100644
--- a/editor/editor_folding.cpp
+++ b/editor/editor_folding.cpp
@@ -37,7 +37,7 @@
 #include "core/error_list.h"
 #include "core/error_macros.h"
 #include "core/io/config_file.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/node_path.h"
 #include "core/object.h"
 #include "core/reference.h"
diff --git a/editor/editor_folding.h b/editor/editor_folding.h
index 8f45418dc..b5d37a412 100644
--- a/editor/editor_folding.h
+++ b/editor/editor_folding.h
@@ -32,9 +32,9 @@
 
 #include "scene/main/node.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/resource.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/ustring.h"
 
 class Array;
diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp
index fa8645d73..136463acf 100644
--- a/editor/editor_help.cpp
+++ b/editor/editor_help.cpp
@@ -41,7 +41,7 @@
 #include "scene/gui/texture_button.h"
 #include "core/class_db.h"
 #include "core/io/resource_loader.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
@@ -50,7 +50,7 @@
 #include "core/os/memory.h"
 #include "core/os/os.h"
 #include "core/pair.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/typedefs.h"
 #include "core/variant.h"
 #include "scene/2d/canvas_item.h"
diff --git a/editor/editor_help.h b/editor/editor_help.h
index 0b5a73c61..dd37aa9d8 100644
--- a/editor/editor_help.h
+++ b/editor/editor_help.h
@@ -38,11 +38,11 @@
 
 #include "core/math/color.h"
 #include "core/error_list.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 
 class ConfirmationDialog;
diff --git a/editor/editor_help_search.h b/editor/editor_help_search.h
index 12f02f508..e61da7e60 100644
--- a/editor/editor_help_search.h
+++ b/editor/editor_help_search.h
@@ -34,11 +34,11 @@
 #include "scene/gui/dialogs.h"
 
 #include "core/math/color.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/object.h"
 #include "core/ustring.h"
-#include "core/vector.h"
-#include "core/ordered_hash_map.h"
+#include "core/containers/vector.h"
+#include "core/containers/ordered_hash_map.h"
 
 #include "editor/doc/doc_data.h"
 #include "scene/resources/texture.h"
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp
index f1a232373..e553045e5 100644
--- a/editor/editor_inspector.cpp
+++ b/editor/editor_inspector.cpp
@@ -34,7 +34,7 @@
 #include "core/class_db.h"
 #include "core/dictionary.h"
 #include "core/error_macros.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/os/input.h"
diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h
index 077c8e593..2e1711dde 100644
--- a/editor/editor_inspector.h
+++ b/editor/editor_inspector.h
@@ -36,19 +36,19 @@
 #include "scene/gui/control.h"
 
 #include "core/math/color.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/object_id.h"
 
 #include "core/resource.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/resources/texture.h"
 
diff --git a/editor/editor_layouts_dialog.cpp b/editor/editor_layouts_dialog.cpp
index 7dc5cc219..b38a15f36 100644
--- a/editor/editor_layouts_dialog.cpp
+++ b/editor/editor_layouts_dialog.cpp
@@ -38,13 +38,13 @@
 #include "scene/gui/item_list.h"
 #include "scene/gui/line_edit.h"
 #include "core/error_list.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/math_defs.h"
 #include "core/os/input_event.h"
 #include "core/os/memory.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/gui/control.h"
 
 void EditorLayoutsDialog::_line_gui_input(const Ref<InputEvent> &p_event) {
diff --git a/editor/editor_network_profiler.h b/editor/editor_network_profiler.h
index cc23b60b0..c0255946b 100644
--- a/editor/editor_network_profiler.h
+++ b/editor/editor_network_profiler.h
@@ -33,7 +33,7 @@
 #include "scene/gui/box_container.h"
 
 #include "core/io/multiplayer_api.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/object.h"
 #include "core/object_id.h"
 
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 1e200fc10..2bf0ad9d7 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -54,7 +54,7 @@
 #include "core/os/main_loop.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/print_string.h"
 #include "core/project_settings.h"
 #include "core/script_language.h"
diff --git a/editor/editor_node.h b/editor/editor_node.h
index 2591fd272..56b409a6b 100644
--- a/editor/editor_node.h
+++ b/editor/editor_node.h
@@ -43,8 +43,8 @@
 
 #include "core/dictionary.h"
 #include "core/error_list.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/math/rect2.h"
 #include "core/node_path.h"
 #include "core/os/mutex.h"
@@ -54,12 +54,12 @@
 #include "core/reference.h"
 #include "core/resource.h"
 #include "core/safe_refcount.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "editor/editor_data.h"
 #include "scene/gui/control.h"
 
diff --git a/editor/editor_path.cpp b/editor/editor_path.cpp
index 23e489962..a9634414b 100644
--- a/editor/editor_path.cpp
+++ b/editor/editor_path.cpp
@@ -34,7 +34,7 @@
 #include "editor_scale.h"
 #include "core/class_db.h"
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
diff --git a/editor/editor_path.h b/editor/editor_path.h
index 64dccf9aa..6763c2aec 100644
--- a/editor/editor_path.h
+++ b/editor/editor_path.h
@@ -33,7 +33,7 @@
 #include "scene/gui/button.h"
 
 #include "core/object_id.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class EditorHistory;
 class Label;
diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp
index 416b1846c..03a667fab 100644
--- a/editor/editor_plugin.cpp
+++ b/editor/editor_plugin.cpp
@@ -52,7 +52,7 @@
 #include "core/math/transform.h"
 #include "core/math/vector3.h"
 #include "core/os/input_event.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/resource.h"
 #include "core/rid.h"
 #include "core/rid_handle.h"
diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h
index fc3aa24b0..fd13e8c0c 100644
--- a/editor/editor_plugin.h
+++ b/editor/editor_plugin.h
@@ -41,7 +41,7 @@
 #include "core/error_list.h"
 #include "core/error_macros.h"
 #include "core/io/config_file.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/method_bind.h"
 #include "core/object.h"
 #include "core/os/memory.h"
@@ -49,7 +49,7 @@
 #include "core/undo_redo.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class EditorNode;
 class Spatial;
diff --git a/editor/editor_plugin_settings.h b/editor/editor_plugin_settings.h
index d190dddf9..9c815b7f9 100644
--- a/editor/editor_plugin_settings.h
+++ b/editor/editor_plugin_settings.h
@@ -34,7 +34,7 @@
 
 #include "core/object.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Button;
 class PluginConfigDialog;
diff --git a/editor/editor_profiler.h b/editor/editor_profiler.h
index 640035dde..02e10f568 100644
--- a/editor/editor_profiler.h
+++ b/editor/editor_profiler.h
@@ -33,15 +33,15 @@
 #include "scene/gui/box_container.h"
 
 #include "core/math/color.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/object.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/resources/texture.h"
 
diff --git a/editor/editor_properties.h b/editor/editor_properties.h
index 3f4cb4e6a..5d6f982db 100644
--- a/editor/editor_properties.h
+++ b/editor/editor_properties.h
@@ -43,7 +43,7 @@
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class AcceptDialog;
 class Button;
diff --git a/editor/editor_properties_array_dict.cpp b/editor/editor_properties_array_dict.cpp
index 10a8febd4..207c8a1f5 100644
--- a/editor/editor_properties_array_dict.cpp
+++ b/editor/editor_properties_array_dict.cpp
@@ -42,7 +42,7 @@
 #include "core/os/memory.h"
 #include "core/resource.h"
 #include "core/typedefs.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
diff --git a/editor/editor_property_name_processor.h b/editor/editor_property_name_processor.h
index 689ae28d9..ab0bf62ee 100644
--- a/editor/editor_property_name_processor.h
+++ b/editor/editor_property_name_processor.h
@@ -32,7 +32,7 @@
 
 #include "scene/main/node.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/object.h"
 #include "core/ustring.h"
 
diff --git a/editor/editor_resource_picker.cpp b/editor/editor_resource_picker.cpp
index ad5fa2c2d..2b2803265 100644
--- a/editor/editor_resource_picker.cpp
+++ b/editor/editor_resource_picker.cpp
@@ -41,7 +41,7 @@
 #include "core/dictionary.h"
 #include "core/error_macros.h"
 #include "core/io/resource_loader.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/math_defs.h"
 #include "core/math/rect2.h"
 #include "core/os/input_event.h"
diff --git a/editor/editor_resource_picker.h b/editor/editor_resource_picker.h
index bf2fe855e..5c58896d3 100644
--- a/editor/editor_resource_picker.h
+++ b/editor/editor_resource_picker.h
@@ -32,17 +32,17 @@
 
 #include "scene/gui/box_container.h"
 
-#include "core/hash_map.h"
-#include "core/list.h"
+#include "core/containers/hash_map.h"
+#include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/object_id.h"
 #include "core/reference.h"
 #include "core/resource.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Button;
 class Control;
diff --git a/editor/editor_resource_preview.h b/editor/editor_resource_preview.h
index 381d2b6fa..3ab4e5b29 100644
--- a/editor/editor_resource_preview.h
+++ b/editor/editor_resource_preview.h
@@ -36,8 +36,8 @@
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
 #include "core/safe_refcount.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/object_id.h"
@@ -46,7 +46,7 @@
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/resources/texture.h"
 
diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp
index bd2ccaaff..817318139 100644
--- a/editor/editor_run.cpp
+++ b/editor/editor_run.cpp
@@ -41,7 +41,7 @@
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 EditorRun::Status EditorRun::get_status() const {
 	return status;
diff --git a/editor/editor_run.h b/editor/editor_run.h
index f339d2355..1c69b9415 100644
--- a/editor/editor_run.h
+++ b/editor/editor_run.h
@@ -33,7 +33,7 @@
 #include "core/os/os.h"
 
 #include "core/error_list.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/ustring.h"
 
 class EditorRun {
diff --git a/editor/editor_run_native.h b/editor/editor_run_native.h
index 35de2006d..6b97e3253 100644
--- a/editor/editor_run_native.h
+++ b/editor/editor_run_native.h
@@ -32,7 +32,7 @@
 
 #include "scene/gui/box_container.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/object.h"
 
 class MenuButton;
diff --git a/editor/editor_sectioned_inspector.cpp b/editor/editor_sectioned_inspector.cpp
index 5433526d9..b76e22f0a 100644
--- a/editor/editor_sectioned_inspector.cpp
+++ b/editor/editor_sectioned_inspector.cpp
@@ -33,13 +33,13 @@
 #include "editor_property_name_processor.h"
 #include "editor_scale.h"
 #include "core/class_db.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "editor/editor_inspector.h"
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"
diff --git a/editor/editor_sectioned_inspector.h b/editor/editor_sectioned_inspector.h
index 0d0539db0..0ff9ccd06 100644
--- a/editor/editor_sectioned_inspector.h
+++ b/editor/editor_sectioned_inspector.h
@@ -32,7 +32,7 @@
 
 #include "scene/gui/split_container.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/object.h"
 #include "core/object_id.h"
 #include "core/ustring.h"
diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp
index b01727f86..1cdeaab10 100644
--- a/editor/editor_settings.cpp
+++ b/editor/editor_settings.cpp
@@ -53,7 +53,7 @@
 #include "core/os/os.h"
 #include "core/print_string.h"
 #include "core/project_settings.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/translation.h"
 #include "core/typedefs.h"
 #include "core/version_generated.gen.h"
diff --git a/editor/editor_settings.h b/editor/editor_settings.h
index e4a53d6fe..452af211b 100644
--- a/editor/editor_settings.h
+++ b/editor/editor_settings.h
@@ -38,14 +38,14 @@
 #include "core/io/config_file.h"
 #include "core/os/thread_safe.h"
 #include "core/translation.h"
-#include "core/hash_map.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/hash_map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/reference.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class EditorPlugin;
 class Dictionary;
diff --git a/editor/editor_sub_scene.h b/editor/editor_sub_scene.h
index 55085c47d..7813b99a7 100644
--- a/editor/editor_sub_scene.h
+++ b/editor/editor_sub_scene.h
@@ -32,7 +32,7 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/object.h"
 #include "core/ustring.h"
 
diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp
index 8f739ea48..a8c56bb7e 100644
--- a/editor/editor_themes.cpp
+++ b/editor/editor_themes.cpp
@@ -46,7 +46,7 @@
 #include "core/math/math_funcs.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
diff --git a/editor/editor_translation.h b/editor/editor_translation.h
index abf965726..b25b0eb03 100644
--- a/editor/editor_translation.h
+++ b/editor/editor_translation.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 Vector<String> get_editor_locales();
 void load_editor_translations(const String &p_locale);
diff --git a/editor/export_template_manager.cpp b/editor/export_template_manager.cpp
index 1d2815f98..b8afb1e1d 100644
--- a/editor/export_template_manager.cpp
+++ b/editor/export_template_manager.cpp
@@ -42,9 +42,9 @@
 #include "core/os/file_access.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
-#include "core/pool_vector.h"
-#include "core/set.h"
-#include "core/vector.h"
+#include "core/containers/pool_vector.h"
+#include "core/containers/set.h"
+#include "core/containers/vector.h"
 #include "core/version.h"
 #include "core/version_generated.gen.h"
 #include "editor/editor_settings.h"
diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h
index b691107f3..3aa52b27f 100644
--- a/editor/filesystem_dock.h
+++ b/editor/filesystem_dock.h
@@ -36,16 +36,16 @@
 
 #include "core/os/dir_access.h"
 #include "core/os/thread.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/reference.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class EditorNode;
 class Button;
diff --git a/editor/find_in_files.cpp b/editor/find_in_files.cpp
index 416906898..fa89722ea 100644
--- a/editor/find_in_files.cpp
+++ b/editor/find_in_files.cpp
@@ -54,7 +54,7 @@
 #include "core/math/vector2.h"
 #include "core/os/file_access.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/print_string.h"
 #include "core/reference.h"
 #include "core/typedefs.h"
diff --git a/editor/find_in_files.h b/editor/find_in_files.h
index b65632394..e07f5bce5 100644
--- a/editor/find_in_files.h
+++ b/editor/find_in_files.h
@@ -34,13 +34,13 @@
 #include "scene/gui/control.h"
 #include "scene/main/node.h"
 
-#include "core/hash_map.h"
-#include "core/map.h"
+#include "core/containers/hash_map.h"
+#include "core/containers/map.h"
 #include "core/object.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Button;
 class Label;
diff --git a/editor/groups_editor.cpp b/editor/groups_editor.cpp
index 58276fafb..10e054f57 100644
--- a/editor/groups_editor.cpp
+++ b/editor/groups_editor.cpp
@@ -37,7 +37,7 @@
 #include "scene/gui/label.h"
 #include "scene/resources/packed_scene.h"
 #include "core/class_db.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/node_path.h"
 #include "core/os/memory.h"
diff --git a/editor/import_defaults_editor.cpp b/editor/import_defaults_editor.cpp
index 0eb5b3be1..cc3f6273a 100644
--- a/editor/import_defaults_editor.cpp
+++ b/editor/import_defaults_editor.cpp
@@ -33,8 +33,8 @@
 #include "core/class_db.h"
 #include "core/dictionary.h"
 #include "core/io/resource_importer.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/os/memory.h"
 #include "core/project_settings.h"
 #include "core/reference.h"
@@ -42,7 +42,7 @@
 #include "core/typedefs.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "editor/editor_inspector.h"
 #include "scene/gui/button.h"
 #include "scene/gui/center_container.h"
diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp
index 2cd4751d9..2f5e1001b 100644
--- a/editor/import_dock.cpp
+++ b/editor/import_dock.cpp
@@ -42,9 +42,9 @@
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
 #include "core/pair.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/typedefs.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_inspector.h"
 #include "editor/editor_settings.h"
diff --git a/editor/import_dock.h b/editor/import_dock.h
index 5e5ed6c4f..68047ef68 100644
--- a/editor/import_dock.h
+++ b/editor/import_dock.h
@@ -33,8 +33,8 @@
 #include "scene/gui/box_container.h"
 
 #include "core/io/config_file.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/string_name.h"
diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp
index 2726d1144..7c09641a2 100644
--- a/editor/inspector_dock.cpp
+++ b/editor/inspector_dock.cpp
@@ -33,12 +33,12 @@
 #include "core/class_db.h"
 #include "core/error_macros.h"
 #include "core/io/resource_loader.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/method_bind.h"
 #include "core/object_id.h"
 #include "core/os/memory.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "core/undo_redo.h"
diff --git a/editor/multi_node_edit.cpp b/editor/multi_node_edit.cpp
index 67d930b74..b689dc9b2 100644
--- a/editor/multi_node_edit.cpp
+++ b/editor/multi_node_edit.cpp
@@ -33,7 +33,7 @@
 #include "core/math/math_fieldwise.h"
 #include "editor_node.h"
 #include "core/error_macros.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/undo_redo.h"
 #include "editor/editor_inspector.h"
 #include "scene/main/node.h"
diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/plugins/abstract_polygon_2d_editor.cpp
index 362a3849e..d0ce66321 100644
--- a/editor/plugins/abstract_polygon_2d_editor.cpp
+++ b/editor/plugins/abstract_polygon_2d_editor.cpp
@@ -42,7 +42,7 @@
 #include "core/math/transform_2d.h"
 #include "core/os/input_event.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/typedefs.h"
 #include "core/undo_redo.h"
 #include "editor/editor_node.h"
diff --git a/editor/plugins/abstract_polygon_2d_editor.h b/editor/plugins/abstract_polygon_2d_editor.h
index 2964c8812..e4dd044ad 100644
--- a/editor/plugins/abstract_polygon_2d_editor.h
+++ b/editor/plugins/abstract_polygon_2d_editor.h
@@ -35,7 +35,7 @@
 #include "core/reference.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "editor/editor_plugin.h"
 #include "scene/gui/box_container.h"
diff --git a/editor/plugins/animation_blend_space_1d_editor.cpp b/editor/plugins/animation_blend_space_1d_editor.cpp
index cf4f2f583..2010b5d94 100644
--- a/editor/plugins/animation_blend_space_1d_editor.cpp
+++ b/editor/plugins/animation_blend_space_1d_editor.cpp
@@ -37,7 +37,7 @@
 #include "core/math/color.h"
 #include "core/error_macros.h"
 #include "core/io/resource_loader.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
 #include "core/math/transform_2d.h"
diff --git a/editor/plugins/animation_blend_space_1d_editor.h b/editor/plugins/animation_blend_space_1d_editor.h
index 754060be9..eecc8c7fc 100644
--- a/editor/plugins/animation_blend_space_1d_editor.h
+++ b/editor/plugins/animation_blend_space_1d_editor.h
@@ -37,7 +37,7 @@
 #include "core/reference.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Button;
 class Control;
diff --git a/editor/plugins/animation_blend_space_2d_editor.cpp b/editor/plugins/animation_blend_space_2d_editor.cpp
index 45de672cc..ef0f02d37 100644
--- a/editor/plugins/animation_blend_space_2d_editor.cpp
+++ b/editor/plugins/animation_blend_space_2d_editor.cpp
@@ -40,7 +40,7 @@
 #include "core/class_db.h"
 #include "core/math/color.h"
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/geometry.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
diff --git a/editor/plugins/animation_blend_space_2d_editor.h b/editor/plugins/animation_blend_space_2d_editor.h
index 77ca0303c..4d4bd7b07 100644
--- a/editor/plugins/animation_blend_space_2d_editor.h
+++ b/editor/plugins/animation_blend_space_2d_editor.h
@@ -37,7 +37,7 @@
 #include "core/reference.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Button;
 class Control;
diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp
index f2655349d..b142fa3b6 100644
--- a/editor/plugins/animation_blend_tree_editor_plugin.cpp
+++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp
@@ -34,12 +34,12 @@
 #include "core/class_db.h"
 #include "core/math/color.h"
 #include "core/error_macros.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/io/resource_loader.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/node_path.h"
 #include "core/os/memory.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/typedefs.h"
 #include "core/undo_redo.h"
 #include "editor/editor_file_dialog.h"
diff --git a/editor/plugins/animation_blend_tree_editor_plugin.h b/editor/plugins/animation_blend_tree_editor_plugin.h
index e10d256b4..cc35d56e4 100644
--- a/editor/plugins/animation_blend_tree_editor_plugin.h
+++ b/editor/plugins/animation_blend_tree_editor_plugin.h
@@ -33,7 +33,7 @@
 #include "editor/plugins/animation_tree_editor_plugin.h"
 
 #include "core/array.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/reference.h"
@@ -41,7 +41,7 @@
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class ProgressBar;
 class AcceptDialog;
diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp
index 6cfbe1706..6615b9deb 100644
--- a/editor/plugins/animation_player_editor_plugin.cpp
+++ b/editor/plugins/animation_player_editor_plugin.cpp
@@ -49,7 +49,7 @@
 #include "core/error_list.h"
 #include "core/error_macros.h"
 #include "core/image.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
 #include "core/os/input_event.h"
diff --git a/editor/plugins/animation_player_editor_plugin.h b/editor/plugins/animation_player_editor_plugin.h
index 981fefeb3..a54be257b 100644
--- a/editor/plugins/animation_player_editor_plugin.h
+++ b/editor/plugins/animation_player_editor_plugin.h
@@ -39,7 +39,7 @@
 #include "core/reference.h"
 #include "core/rid.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class AnimationTrackEditor;
 class AnimationPlayerEditorPlugin;
diff --git a/editor/plugins/animation_state_machine_editor.cpp b/editor/plugins/animation_state_machine_editor.cpp
index 2bcef78ee..a5901eb66 100644
--- a/editor/plugins/animation_state_machine_editor.cpp
+++ b/editor/plugins/animation_state_machine_editor.cpp
@@ -38,7 +38,7 @@
 #include "core/class_db.h"
 #include "core/math/color.h"
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/geometry.h"
 #include "core/math/math_defs.h"
 #include "core/math/transform_2d.h"
diff --git a/editor/plugins/animation_state_machine_editor.h b/editor/plugins/animation_state_machine_editor.h
index 98bce7750..4ab7da9f0 100644
--- a/editor/plugins/animation_state_machine_editor.h
+++ b/editor/plugins/animation_state_machine_editor.h
@@ -39,7 +39,7 @@
 #include "core/reference.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class EditorFileDialog;
 class HBoxContainer;
diff --git a/editor/plugins/animation_tree_editor_plugin.cpp b/editor/plugins/animation_tree_editor_plugin.cpp
index 6d3a9923d..26c657f4b 100644
--- a/editor/plugins/animation_tree_editor_plugin.cpp
+++ b/editor/plugins/animation_tree_editor_plugin.cpp
@@ -40,7 +40,7 @@
 #include "scene/scene_string_names.h"
 #include "core/class_db.h"
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
 #include "core/string_name.h"
diff --git a/editor/plugins/animation_tree_editor_plugin.h b/editor/plugins/animation_tree_editor_plugin.h
index ba3afb25d..4c6a34654 100644
--- a/editor/plugins/animation_tree_editor_plugin.h
+++ b/editor/plugins/animation_tree_editor_plugin.h
@@ -37,7 +37,7 @@
 #include "core/object_id.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class AnimationNode;
 class AnimationTree;
diff --git a/editor/plugins/audio_stream_editor_plugin.cpp b/editor/plugins/audio_stream_editor_plugin.cpp
index 1d813412f..c5b5acc5f 100644
--- a/editor/plugins/audio_stream_editor_plugin.cpp
+++ b/editor/plugins/audio_stream_editor_plugin.cpp
@@ -42,7 +42,7 @@
 #include "core/os/input_event.h"
 #include "core/os/memory.h"
 #include "core/typedefs.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "editor/editor_node.h"
 #include "scene/2d/canvas_item.h"
 #include "scene/audio/audio_stream_player.h"
diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp
index b8bca1ef1..311210c9a 100644
--- a/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/editor/plugins/canvas_item_editor_plugin.cpp
@@ -63,7 +63,7 @@
 #include "core/node_path.h"
 #include "core/os/input_event.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/resource.h"
 #include "core/rid.h"
 #include "core/string_name.h"
diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h
index e8543dcf1..0bec69b85 100644
--- a/editor/plugins/canvas_item_editor_plugin.h
+++ b/editor/plugins/canvas_item_editor_plugin.h
@@ -35,8 +35,8 @@
 #include "scene/gui/box_container.h"
 
 #include "core/dictionary.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/math/math_defs.h"
 #include "core/math/rect2.h"
 #include "core/math/transform_2d.h"
@@ -47,7 +47,7 @@
 #include "core/typedefs.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class CanvasItemEditorViewport;
 class AcceptDialog;
diff --git a/editor/plugins/collision_polygon_editor_plugin.cpp b/editor/plugins/collision_polygon_editor_plugin.cpp
index a789c424d..13b72c935 100644
--- a/editor/plugins/collision_polygon_editor_plugin.cpp
+++ b/editor/plugins/collision_polygon_editor_plugin.cpp
@@ -49,7 +49,7 @@
 #include "core/math/vector3.h"
 #include "core/os/input_event.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/undo_redo.h"
 #include "core/variant.h"
 #include "editor/editor_node.h"
diff --git a/editor/plugins/collision_polygon_editor_plugin.h b/editor/plugins/collision_polygon_editor_plugin.h
index 0ee6a51e7..af77d2e0a 100644
--- a/editor/plugins/collision_polygon_editor_plugin.h
+++ b/editor/plugins/collision_polygon_editor_plugin.h
@@ -37,7 +37,7 @@
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class CanvasItemEditor;
 class ArrayMesh;
diff --git a/editor/plugins/collision_shape_2d_editor_plugin.h b/editor/plugins/collision_shape_2d_editor_plugin.h
index 2460256ea..25d8fd8a2 100644
--- a/editor/plugins/collision_shape_2d_editor_plugin.h
+++ b/editor/plugins/collision_shape_2d_editor_plugin.h
@@ -39,7 +39,7 @@
 #include "core/reference.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class CanvasItemEditor;
 class CollisionShape2D;
diff --git a/editor/plugins/cpu_particles_2d_editor_plugin.cpp b/editor/plugins/cpu_particles_2d_editor_plugin.cpp
index 78153169d..71072d104 100644
--- a/editor/plugins/cpu_particles_2d_editor_plugin.cpp
+++ b/editor/plugins/cpu_particles_2d_editor_plugin.cpp
@@ -38,13 +38,13 @@
 #include "core/error_list.h"
 #include "core/error_macros.h"
 #include "core/image.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "scene/gui/box_container.h"
diff --git a/editor/plugins/cpu_particles_editor_plugin.cpp b/editor/plugins/cpu_particles_editor_plugin.cpp
index 2d76f915d..f2d3e886c 100644
--- a/editor/plugins/cpu_particles_editor_plugin.cpp
+++ b/editor/plugins/cpu_particles_editor_plugin.cpp
@@ -34,7 +34,7 @@
 #include "core/class_db.h"
 #include "core/math/vector3.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "editor/scene_tree_editor.h"
diff --git a/editor/plugins/editor_preview_plugins.cpp b/editor/plugins/editor_preview_plugins.cpp
index 9b62851f2..6d1ff6555 100644
--- a/editor/plugins/editor_preview_plugins.cpp
+++ b/editor/plugins/editor_preview_plugins.cpp
@@ -45,7 +45,7 @@
 #include "core/error_list.h"
 #include "core/error_macros.h"
 #include "core/image.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/aabb.h"
 #include "core/math/audio_frame.h"
 #include "core/math/basis.h"
@@ -55,12 +55,12 @@
 #include "core/math/vector3.h"
 #include "core/os/file_access.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/rid_handle.h"
 #include "core/script_language.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/typedefs.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/resources/font.h"
 #include "scene/resources/shader.h"
 #include "scene/resources/texture.h"
diff --git a/editor/plugins/gradient_editor_plugin.cpp b/editor/plugins/gradient_editor_plugin.cpp
index b4ede7c8d..4050831c2 100644
--- a/editor/plugins/gradient_editor_plugin.cpp
+++ b/editor/plugins/gradient_editor_plugin.cpp
@@ -34,7 +34,7 @@
 #include "core/class_db.h"
 #include "core/os/memory.h"
 #include "core/undo_redo.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "editor/editor_node.h"
 #include "scene/resources/gradient.h"
 
diff --git a/editor/plugins/item_list_editor_plugin.h b/editor/plugins/item_list_editor_plugin.h
index 4401b9e09..f03019696 100644
--- a/editor/plugins/item_list_editor_plugin.h
+++ b/editor/plugins/item_list_editor_plugin.h
@@ -38,12 +38,12 @@
 #include "scene/gui/item_list.h"
 
 #include "scene/gui/popup_menu.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/reference.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/resources/texture.h"
 
diff --git a/editor/plugins/light_occluder_2d_editor_plugin.cpp b/editor/plugins/light_occluder_2d_editor_plugin.cpp
index 6c5ff0a0d..131390e4b 100644
--- a/editor/plugins/light_occluder_2d_editor_plugin.cpp
+++ b/editor/plugins/light_occluder_2d_editor_plugin.cpp
@@ -32,10 +32,10 @@
 
 #include "core/math/vector2.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/undo_redo.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/2d/light_occluder_2d.h"
 #include "scene/main/node.h"
 
diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp
index a893e9b91..b6b0a9343 100644
--- a/editor/plugins/material_editor_plugin.cpp
+++ b/editor/plugins/material_editor_plugin.cpp
@@ -41,7 +41,7 @@
 #include "core/class_db.h"
 #include "core/math/color.h"
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/basis.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
diff --git a/editor/plugins/mesh_instance_editor_plugin.cpp b/editor/plugins/mesh_instance_editor_plugin.cpp
index 292eb8795..892720f26 100644
--- a/editor/plugins/mesh_instance_editor_plugin.cpp
+++ b/editor/plugins/mesh_instance_editor_plugin.cpp
@@ -41,13 +41,13 @@
 #include "core/class_db.h"
 #include "core/math/color.h"
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/undo_redo.h"
 #include "core/variant.h"
 #include "editor/editor_data.h"
diff --git a/editor/plugins/mesh_instance_editor_plugin.h b/editor/plugins/mesh_instance_editor_plugin.h
index d9c291fc0..55333b73f 100644
--- a/editor/plugins/mesh_instance_editor_plugin.h
+++ b/editor/plugins/mesh_instance_editor_plugin.h
@@ -36,7 +36,7 @@
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 
 class AcceptDialog;
diff --git a/editor/plugins/multimesh_editor_plugin.cpp b/editor/plugins/multimesh_editor_plugin.cpp
index c2b7a11cd..d414aebc8 100644
--- a/editor/plugins/multimesh_editor_plugin.cpp
+++ b/editor/plugins/multimesh_editor_plugin.cpp
@@ -36,7 +36,7 @@
 #include "spatial_editor_plugin.h"
 #include "core/class_db.h"
 #include "core/error_macros.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/basis.h"
 #include "core/math/face3.h"
 #include "core/math/math_defs.h"
@@ -46,7 +46,7 @@
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
 #include "core/typedefs.h"
 #include "editor/editor_node.h"
diff --git a/editor/plugins/navigation_polygon_editor_plugin.cpp b/editor/plugins/navigation_polygon_editor_plugin.cpp
index 21cd1bea7..568d762f5 100644
--- a/editor/plugins/navigation_polygon_editor_plugin.cpp
+++ b/editor/plugins/navigation_polygon_editor_plugin.cpp
@@ -34,7 +34,7 @@
 #include "core/os/memory.h"
 #include "core/undo_redo.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/2d/navigation_polygon.h"
 #include "scene/main/node.h"
 
diff --git a/editor/plugins/particles_editor_plugin.cpp b/editor/plugins/particles_editor_plugin.cpp
index b45470353..98b5e7f23 100644
--- a/editor/plugins/particles_editor_plugin.cpp
+++ b/editor/plugins/particles_editor_plugin.cpp
@@ -33,8 +33,8 @@
 #include "core/io/resource_loader.h"
 #include "core/class_db.h"
 #include "core/error_macros.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/math/aabb.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
diff --git a/editor/plugins/particles_editor_plugin.h b/editor/plugins/particles_editor_plugin.h
index cf24cd041..98201f1fe 100644
--- a/editor/plugins/particles_editor_plugin.h
+++ b/editor/plugins/particles_editor_plugin.h
@@ -36,7 +36,7 @@
 #include "core/math/face3.h"
 #include "core/node_path.h"
 #include "core/object.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 
 class ConfirmationDialog;
diff --git a/editor/plugins/path_editor_plugin.cpp b/editor/plugins/path_editor_plugin.cpp
index 7ad875077..5fbbb8669 100644
--- a/editor/plugins/path_editor_plugin.cpp
+++ b/editor/plugins/path_editor_plugin.cpp
@@ -40,9 +40,9 @@
 #include "core/os/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/undo_redo.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "editor/editor_node.h"
 #include "editor/editor_settings.h"
 #include "scene/3d/camera.h"
diff --git a/editor/plugins/polygon_2d_editor_plugin.h b/editor/plugins/polygon_2d_editor_plugin.h
index 969db35ed..b17ab92f8 100644
--- a/editor/plugins/polygon_2d_editor_plugin.h
+++ b/editor/plugins/polygon_2d_editor_plugin.h
@@ -36,9 +36,9 @@
 #include "core/math/color.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class AcceptDialog;
 class Button;
diff --git a/editor/plugins/resource_preloader_editor_plugin.cpp b/editor/plugins/resource_preloader_editor_plugin.cpp
index 6495f009a..276ce2de8 100644
--- a/editor/plugins/resource_preloader_editor_plugin.cpp
+++ b/editor/plugins/resource_preloader_editor_plugin.cpp
@@ -36,12 +36,12 @@
 #include "core/class_db.h"
 #include "core/dictionary.h"
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/os/memory.h"
 #include "core/resource.h"
 #include "core/string_name.h"
 #include "core/undo_redo.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_node.h"
 #include "scene/2d/canvas_item.h"
diff --git a/editor/plugins/room_manager_editor_plugin.cpp b/editor/plugins/room_manager_editor_plugin.cpp
index f4920ae83..dcef8055f 100644
--- a/editor/plugins/room_manager_editor_plugin.cpp
+++ b/editor/plugins/room_manager_editor_plugin.cpp
@@ -34,12 +34,12 @@
 #include "scene/resources/occluder_shape.h"
 #include "core/class_db.h"
 #include "core/engine.h"
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/math/math_defs.h"
 #include "core/math/transform.h"
 #include "core/math/vector3.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
 #include "core/string_name.h"
 #include "core/undo_redo.h"
diff --git a/editor/plugins/root_motion_editor_plugin.cpp b/editor/plugins/root_motion_editor_plugin.cpp
index e4ec7a73a..c1024f457 100644
--- a/editor/plugins/root_motion_editor_plugin.cpp
+++ b/editor/plugins/root_motion_editor_plugin.cpp
@@ -35,11 +35,11 @@
 #include "scene/main/viewport.h"
 #include "core/class_db.h"
 #include "core/error_macros.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/os/memory.h"
 #include "core/reference.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "scene/animation/animation_player.h"
diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp
index b2da17b84..dc94ab861 100644
--- a/editor/plugins/script_editor_plugin.cpp
+++ b/editor/plugins/script_editor_plugin.cpp
@@ -55,7 +55,7 @@
 #include "core/error_macros.h"
 #include "core/io/config_file.h"
 #include "core/io/resource_saver.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/math_funcs.h"
 #include "core/math/transform_2d.h"
 #include "core/os/input_event.h"
diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h
index 1a99e150c..03df4c585 100644
--- a/editor/plugins/script_editor_plugin.h
+++ b/editor/plugins/script_editor_plugin.h
@@ -40,16 +40,16 @@
 #include "core/script_language.h"
 #include "core/array.h"
 #include "core/error_list.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/resource.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/typedefs.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Button;
 class ConfigFile;
diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp
index 4558412f5..fe6d0af4f 100644
--- a/editor/plugins/script_text_editor.cpp
+++ b/editor/plugins/script_text_editor.cpp
@@ -47,7 +47,7 @@
 #include "core/os/memory.h"
 #include "core/project_settings.h"
 #include "core/script_language.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "editor/editor_node.h"
diff --git a/editor/plugins/script_text_editor.h b/editor/plugins/script_text_editor.h
index 9e192755c..31f337330 100644
--- a/editor/plugins/script_text_editor.h
+++ b/editor/plugins/script_text_editor.h
@@ -34,11 +34,11 @@
 #include "script_editor_plugin.h"
 
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/color.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/resource.h"
diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp
index c0b569368..47d50d488 100644
--- a/editor/plugins/shader_editor_plugin.cpp
+++ b/editor/plugins/shader_editor_plugin.cpp
@@ -37,7 +37,7 @@
 #include "core/error_macros.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/transform_2d.h"
 #include "core/os/file_access.h"
 #include "core/os/input_event.h"
@@ -47,7 +47,7 @@
 #include "core/os/os.h"
 #include "core/string_name.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "core/version_generated.gen.h"
 #include "editor/editor_node.h"
 #include "editor/editor_scale.h"
diff --git a/editor/plugins/shader_editor_plugin.h b/editor/plugins/shader_editor_plugin.h
index ecd761273..765646d7e 100644
--- a/editor/plugins/shader_editor_plugin.h
+++ b/editor/plugins/shader_editor_plugin.h
@@ -36,7 +36,7 @@
 
 #include "scene/resources/shader.h"
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/reference.h"
diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp
index 3421b3d8c..bd3dee85b 100644
--- a/editor/plugins/spatial_editor_plugin.cpp
+++ b/editor/plugins/spatial_editor_plugin.cpp
@@ -34,7 +34,7 @@
 #include "core/class_db.h"
 #include "core/engine.h"
 #include "core/io/resource_loader.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/basis.h"
 #include "core/math/projection.h"
 #include "core/math/geometry.h"
@@ -47,11 +47,11 @@
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/project_settings.h"
 #include "core/rid_handle.h"
 #include "core/script_language.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/undo_redo.h"
 #include "editor/animation_track_editor.h"
diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h
index f49998f85..a69928616 100644
--- a/editor/plugins/spatial_editor_plugin.h
+++ b/editor/plugins/spatial_editor_plugin.h
@@ -42,8 +42,8 @@
 #include "core/math/color.h"
 #include "core/dictionary.h"
 #include "core/error_macros.h"
-#include "core/hash_map.h"
-#include "core/list.h"
+#include "core/containers/hash_map.h"
+#include "core/containers/list.h"
 #include "core/math/aabb.h"
 #include "core/math/math_defs.h"
 #include "core/math/transform.h"
@@ -57,7 +57,7 @@
 #include "core/typedefs.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "editor/editor_scale.h"
 
 #include "editor/spatial_editor_gizmos.h"
diff --git a/editor/plugins/sprite_editor_plugin.cpp b/editor/plugins/sprite_editor_plugin.cpp
index 279e758c7..e2eee16df 100644
--- a/editor/plugins/sprite_editor_plugin.cpp
+++ b/editor/plugins/sprite_editor_plugin.cpp
@@ -48,7 +48,7 @@
 #include "core/math/geometry.h"
 #include "core/math/rect2.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
 #include "core/undo_redo.h"
 #include "core/variant.h"
diff --git a/editor/plugins/sprite_editor_plugin.h b/editor/plugins/sprite_editor_plugin.h
index baad261dc..243f29844 100644
--- a/editor/plugins/sprite_editor_plugin.h
+++ b/editor/plugins/sprite_editor_plugin.h
@@ -36,7 +36,7 @@
 #include "core/math/vector2.h"
 #include "core/object.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 
 class AcceptDialog;
diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp
index c91573f48..0ddb1a413 100644
--- a/editor/plugins/sprite_frames_editor_plugin.cpp
+++ b/editor/plugins/sprite_frames_editor_plugin.cpp
@@ -35,7 +35,7 @@
 #include "core/dictionary.h"
 #include "core/error_macros.h"
 #include "core/io/resource_loader.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/math_defs.h"
 #include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
@@ -43,11 +43,11 @@
 #include "core/os/input_event.h"
 #include "core/os/keyboard.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/resource.h"
 #include "core/typedefs.h"
 #include "core/undo_redo.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_file_system.h"
 #include "editor/editor_node.h"
diff --git a/editor/plugins/sprite_frames_editor_plugin.h b/editor/plugins/sprite_frames_editor_plugin.h
index 0214053b9..ad76cb699 100644
--- a/editor/plugins/sprite_frames_editor_plugin.h
+++ b/editor/plugins/sprite_frames_editor_plugin.h
@@ -35,9 +35,9 @@
 
 #include "core/math/vector2.h"
 #include "core/object.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant.h"
diff --git a/editor/plugins/text_editor.h b/editor/plugins/text_editor.h
index 9c18500d8..3b48153a9 100644
--- a/editor/plugins/text_editor.h
+++ b/editor/plugins/text_editor.h
@@ -33,14 +33,14 @@
 #include "script_editor_plugin.h"
 
 #include "core/math/color.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/resource.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "editor/code_editor.h"
 
 class Control;
diff --git a/editor/plugins/texture_region_editor_plugin.h b/editor/plugins/texture_region_editor_plugin.h
index 88fb08c71..e397632b8 100644
--- a/editor/plugins/texture_region_editor_plugin.h
+++ b/editor/plugins/texture_region_editor_plugin.h
@@ -37,8 +37,8 @@
 #include "scene/resources/texture.h"
 
 #include "core/dictionary.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
 #include "core/object.h"
diff --git a/editor/plugins/theme_editor_plugin.h b/editor/plugins/theme_editor_plugin.h
index 9420176eb..0bcce9e7b 100644
--- a/editor/plugins/theme_editor_plugin.h
+++ b/editor/plugins/theme_editor_plugin.h
@@ -38,15 +38,15 @@
 #include "scene/resources/style_box.h"
 #include "scene/resources/theme.h"
 
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/object.h"
-#include "core/ordered_hash_map.h"
+#include "core/containers/ordered_hash_map.h"
 #include "core/reference.h"
 #include "core/resource.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Button;
 class CheckButton;
diff --git a/editor/progress_dialog.h b/editor/progress_dialog.h
index 419f07617..cc94856fe 100644
--- a/editor/progress_dialog.h
+++ b/editor/progress_dialog.h
@@ -33,7 +33,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/popup.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/os/thread_safe.h"
 #include "core/ustring.h"
 
diff --git a/editor/project_export.cpp b/editor/project_export.cpp
index 44cf09039..89e5114ba 100644
--- a/editor/project_export.cpp
+++ b/editor/project_export.cpp
@@ -34,13 +34,13 @@
 #include "core/dictionary.h"
 #include "core/error_list.h"
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/rect2.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
 #include "core/project_settings.h"
-#include "core/set.h"
-#include "core/vector.h"
+#include "core/containers/set.h"
+#include "core/containers/vector.h"
 #include "editor/editor_export.h"
 #include "editor/editor_file_dialog.h"
 #include "editor/editor_file_system.h"
diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp
index 184abfbde..2a7eb0995 100644
--- a/editor/project_manager.cpp
+++ b/editor/project_manager.cpp
@@ -49,14 +49,14 @@
 #include "core/os/main_loop.h"
 #include "core/os/memory.h"
 #include "core/os/os.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/print_string.h"
 #include "core/project_settings.h"
-#include "core/set.h"
-#include "core/sort_array.h"
+#include "core/containers/set.h"
+#include "core/containers/sort_array.h"
 #include "core/translation.h"
 #include "core/typedefs.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "core/version.h"
 #include "core/version_generated.gen.h"
 #include "editor/editor_about.h"
diff --git a/editor/project_manager.h b/editor/project_manager.h
index fb8e6702f..bed9399de 100644
--- a/editor/project_manager.h
+++ b/editor/project_manager.h
@@ -33,7 +33,7 @@
 #include "scene/gui/box_container.h"
 #include "scene/gui/control.h"
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/object.h"
 #include "core/reference.h"
 #include "core/ustring.h"
diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp
index 4b244be1d..6f921d9af 100644
--- a/editor/project_settings_editor.cpp
+++ b/editor/project_settings_editor.cpp
@@ -45,13 +45,13 @@
 #include "core/error_list.h"
 #include "core/error_macros.h"
 #include "core/io/resource_loader.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/math/math_defs.h"
 #include "core/math/rect2.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
-#include "core/set.h"
+#include "core/containers/pool_vector.h"
+#include "core/containers/set.h"
 #include "core/typedefs.h"
 #include "core/undo_redo.h"
 #include "editor/editor_autoload_settings.h"
diff --git a/editor/project_settings_editor.h b/editor/project_settings_editor.h
index 472323fe7..973a491de 100644
--- a/editor/project_settings_editor.h
+++ b/editor/project_settings_editor.h
@@ -37,7 +37,7 @@
 #include "core/reference.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Button;
 class Control;
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp
index 2dc53c545..49442a837 100644
--- a/editor/property_editor.cpp
+++ b/editor/property_editor.cpp
@@ -36,7 +36,7 @@
 #include "core/error_list.h"
 #include "core/error_macros.h"
 #include "core/io/resource_loader.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/aabb.h"
 #include "core/math/basis.h"
 #include "core/math/expression.h"
@@ -59,7 +59,7 @@
 #include "core/resource.h"
 #include "core/rid.h"
 #include "core/script_language.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
 #include "editor/array_property_edit.h"
diff --git a/editor/property_editor.h b/editor/property_editor.h
index aaded9ace..0a50e8721 100644
--- a/editor/property_editor.h
+++ b/editor/property_editor.h
@@ -33,12 +33,12 @@
 #include "core/reference.h"
 #include "scene/gui/popup.h"
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/math_defs.h"
 #include "core/node_path.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class PropertyValueEvaluator;
 class CreateDialog;
diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp
index 26a28e3af..9bcd997d8 100644
--- a/editor/property_selector.cpp
+++ b/editor/property_selector.cpp
@@ -33,8 +33,8 @@
 #include "core/class_db.h"
 #include "core/math/color.h"
 #include "core/error_macros.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/method_bind.h"
 #include "core/os/input_event.h"
 #include "core/os/keyboard.h"
diff --git a/editor/property_selector.h b/editor/property_selector.h
index fc74f1c59..93ba8f28a 100644
--- a/editor/property_selector.h
+++ b/editor/property_selector.h
@@ -36,7 +36,7 @@
 #include "core/reference.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class EditorHelpBit;
 class InputEvent;
diff --git a/editor/quick_open.h b/editor/quick_open.h
index d716ecf08..100b25398 100644
--- a/editor/quick_open.h
+++ b/editor/quick_open.h
@@ -36,7 +36,7 @@
 #include "core/reference.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class EditorFileSystemDirectory;
 class InputEvent;
diff --git a/editor/rename_dialog.h b/editor/rename_dialog.h
index f434e6b30..958a7d922 100644
--- a/editor/rename_dialog.h
+++ b/editor/rename_dialog.h
@@ -35,7 +35,7 @@
 #ifdef MODULE_REGEX_ENABLED
 
 #include "core/error_macros.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/node_path.h"
 #include "core/object.h"
 #include "core/pair.h"
diff --git a/editor/reparent_dialog.h b/editor/reparent_dialog.h
index 84811aff4..2e5a89b26 100644
--- a/editor/reparent_dialog.h
+++ b/editor/reparent_dialog.h
@@ -32,7 +32,7 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "core/set.h"
+#include "core/containers/set.h"
 
 class CheckBox;
 class Node;
diff --git a/editor/scene_tree_dock.h b/editor/scene_tree_dock.h
index c73490404..4a5f03dcd 100644
--- a/editor/scene_tree_dock.h
+++ b/editor/scene_tree_dock.h
@@ -32,16 +32,16 @@
 
 #include "scene/gui/box_container.h"
 
-#include "core/hash_map.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/hash_map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/node_path.h"
 #include "core/object_id.h"
 #include "core/reference.h"
 #include "core/resource.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "modules/modules_enabled.gen.h" // For regex.
 
diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp
index 8796f7720..3235e8897 100644
--- a/editor/scene_tree_editor.cpp
+++ b/editor/scene_tree_editor.cpp
@@ -35,7 +35,7 @@
 #include "core/math/color.h"
 #include "core/dictionary.h"
 #include "core/error_macros.h"
-#include "core/hashfuncs.h"
+#include "core/containers/hashfuncs.h"
 #include "core/math/math_defs.h"
 #include "core/math/transform_2d.h"
 #include "core/message_queue.h"
diff --git a/editor/scene_tree_editor.h b/editor/scene_tree_editor.h
index 85bd398ac..231e5a256 100644
--- a/editor/scene_tree_editor.h
+++ b/editor/scene_tree_editor.h
@@ -33,15 +33,15 @@
 #include "scene/gui/control.h"
 #include "scene/gui/dialogs.h"
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/node_path.h"
 #include "core/object_id.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class EditorSelection;
 class LineEdit;
diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp
index 8a1de155c..5e459b0aa 100644
--- a/editor/script_create_dialog.cpp
+++ b/editor/script_create_dialog.cpp
@@ -35,7 +35,7 @@
 #include "core/error_list.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/vector2.h"
 #include "core/os/dir_access.h"
 #include "core/os/memory.h"
diff --git a/editor/script_create_dialog.h b/editor/script_create_dialog.h
index b52675d3e..c14d05459 100644
--- a/editor/script_create_dialog.h
+++ b/editor/script_create_dialog.h
@@ -32,10 +32,10 @@
 
 #include "scene/gui/dialogs.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/object.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class CreateDialog;
 class Button;
diff --git a/editor/script_editor_debugger.h b/editor/script_editor_debugger.h
index e1b5e0162..c9b42b3a9 100644
--- a/editor/script_editor_debugger.h
+++ b/editor/script_editor_debugger.h
@@ -33,20 +33,20 @@
 #include "scene/gui/margin_container.h"
 
 #include "core/array.h"
-#include "core/hash_map.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/hash_map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/math/vector2.h"
 #include "core/node_path.h"
 #include "core/object.h"
 #include "core/object_id.h"
 #include "core/reference.h"
 #include "core/resource.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Tree;
 class EditorNode;
diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp
index 4f7cccd66..db22cace1 100644
--- a/editor/settings_config_dialog.cpp
+++ b/editor/settings_config_dialog.cpp
@@ -40,8 +40,8 @@
 #include "core/class_db.h"
 #include "core/math/color.h"
 #include "core/error_macros.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/math/math_defs.h"
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp
index 5edf247ae..dd1096f98 100644
--- a/editor/spatial_editor_gizmos.cpp
+++ b/editor/spatial_editor_gizmos.cpp
@@ -34,8 +34,8 @@
 #include "core/class_db.h"
 #include "core/error_list.h"
 #include "core/error_macros.h"
-#include "core/list.h"
-#include "core/map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
 #include "core/math/aabb.h"
 #include "core/math/convex_hull.h"
 #include "core/math/face3.h"
@@ -47,7 +47,7 @@
 #include "core/math/triangle_mesh.h"
 #include "core/node_path.h"
 #include "core/os/memory.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/rid.h"
 #include "core/script_language.h"
 #include "core/typedefs.h"
diff --git a/editor/spatial_editor_gizmos.h b/editor/spatial_editor_gizmos.h
index c22fec965..a82ae4f65 100644
--- a/editor/spatial_editor_gizmos.h
+++ b/editor/spatial_editor_gizmos.h
@@ -38,12 +38,12 @@
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
 #include "core/object.h"
-#include "core/ordered_hash_map.h"
-#include "core/pool_vector.h"
+#include "core/containers/ordered_hash_map.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/resources/mesh.h"
 
diff --git a/main/tests/test_main.cpp b/main/tests/test_main.cpp
index 91fd56282..9e7f2813d 100644
--- a/main/tests/test_main.cpp
+++ b/main/tests/test_main.cpp
@@ -30,7 +30,7 @@
 
 #include "test_main.h"
 
-#include "core/list.h"
+#include "core/containers/list.h"
 
 #ifdef DEBUG_ENABLED
 
diff --git a/main/tests/test_main.h b/main/tests/test_main.h
index 04e832a0a..48a5a04d1 100644
--- a/main/tests/test_main.h
+++ b/main/tests/test_main.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/os/main_loop.h"
 #include "core/ustring.h"
 
diff --git a/main/tests/test_math.cpp b/main/tests/test_math.cpp
index 68ed83804..f74641c4b 100644
--- a/main/tests/test_math.cpp
+++ b/main/tests/test_math.cpp
@@ -40,7 +40,7 @@
 #include "core/print_string.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vmap.h"
+#include "core/containers/vmap.h"
 #include "scene/main/node.h"
 #include "scene/resources/texture.h"
 #include "servers/visual/shader_language.h"
diff --git a/main/tests/test_oa_hash_map.cpp b/main/tests/test_oa_hash_map.cpp
index eec69eff3..efbe903b6 100644
--- a/main/tests/test_oa_hash_map.cpp
+++ b/main/tests/test_oa_hash_map.cpp
@@ -30,7 +30,7 @@
 
 #include "test_oa_hash_map.h"
 
-#include "core/oa_hash_map.h"
+#include "core/containers/oa_hash_map.h"
 #include "core/os/os.h"
 
 namespace TestOAHashMap {
diff --git a/main/tests/test_ordered_hash_map.cpp b/main/tests/test_ordered_hash_map.cpp
index eaddfdecd..6ce3a8f55 100644
--- a/main/tests/test_ordered_hash_map.cpp
+++ b/main/tests/test_ordered_hash_map.cpp
@@ -30,10 +30,10 @@
 
 #include "test_ordered_hash_map.h"
 
-#include "core/ordered_hash_map.h"
+#include "core/containers/ordered_hash_map.h"
 #include "core/os/os.h"
 #include "core/pair.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 namespace TestOrderedHashMap {
 
diff --git a/main/tests/test_physics.cpp b/main/tests/test_physics.cpp
index 8e3b9413f..7bca7b696 100644
--- a/main/tests/test_physics.cpp
+++ b/main/tests/test_physics.cpp
@@ -30,7 +30,7 @@
 
 #include "test_physics.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/convex_hull.h"
 #include "core/math/math_funcs.h"
 #include "core/os/main_loop.h"
diff --git a/main/tests/test_physics_2d.cpp b/main/tests/test_physics_2d.cpp
index 3852fd599..ca5743187 100644
--- a/main/tests/test_physics_2d.cpp
+++ b/main/tests/test_physics_2d.cpp
@@ -30,7 +30,7 @@
 
 #include "test_physics_2d.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/os/main_loop.h"
 #include "core/os/os.h"
 #include "core/print_string.h"
diff --git a/main/tests/test_xml_parser.h b/main/tests/test_xml_parser.h
index 850210839..ddda4e060 100644
--- a/main/tests/test_xml_parser.h
+++ b/main/tests/test_xml_parser.h
@@ -35,7 +35,7 @@
 #include "core/io/xml_parser.h"
 #include "core/os/main_loop.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 namespace TestXMLParser {
 
diff --git a/modules/cscript/cscript_compiler.h b/modules/cscript/cscript_compiler.h
index 97cde600a..65744d7f6 100644
--- a/modules/cscript/cscript_compiler.h
+++ b/modules/cscript/cscript_compiler.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "cscript.h"
 #include "cscript_parser.h"
 
diff --git a/modules/cscript/cscript_function.h b/modules/cscript/cscript_function.h
index 9e9272cbc..03ab80494 100644
--- a/modules/cscript/cscript_function.h
+++ b/modules/cscript/cscript_function.h
@@ -34,7 +34,7 @@
 #include "core/pair.h"
 #include "core/reference.h"
 #include "core/script_language.h"
-#include "core/self_list.h"
+#include "core/containers/self_list.h"
 #include "core/string_name.h"
 #include "core/variant.h"
 
diff --git a/modules/cscript/cscript_parser.h b/modules/cscript/cscript_parser.h
index 3eea2313e..b38561005 100644
--- a/modules/cscript/cscript_parser.h
+++ b/modules/cscript/cscript_parser.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/object.h"
 #include "core/script_language.h"
 #include "cscript_functions.h"
diff --git a/modules/cscript/cscript_tokenizer.cpp b/modules/cscript/cscript_tokenizer.cpp
index b7977cd1f..f9d0d9746 100644
--- a/modules/cscript/cscript_tokenizer.cpp
+++ b/modules/cscript/cscript_tokenizer.cpp
@@ -31,7 +31,7 @@
 #include "cscript_tokenizer.h"
 
 #include "core/io/marshalls.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/print_string.h"
 #include "cscript_functions.h"
 
diff --git a/modules/cscript/cscript_tokenizer.h b/modules/cscript/cscript_tokenizer.h
index b89183f1a..2f2d4f883 100644
--- a/modules/cscript/cscript_tokenizer.h
+++ b/modules/cscript/cscript_tokenizer.h
@@ -34,7 +34,7 @@
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vmap.h"
+#include "core/containers/vmap.h"
 #include "cscript_functions.h"
 
 class CScriptTokenizer {
diff --git a/modules/database/database_manager.h b/modules/database/database_manager.h
index 0e2f9b11a..7804164ee 100644
--- a/modules/database/database_manager.h
+++ b/modules/database/database_manager.h
@@ -3,7 +3,7 @@
 
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/object.h"
 
diff --git a/modules/database/database_multi_threaded.h b/modules/database/database_multi_threaded.h
index a7f6690bc..deedc8279 100644
--- a/modules/database/database_multi_threaded.h
+++ b/modules/database/database_multi_threaded.h
@@ -1,7 +1,7 @@
 #ifndef DATABASE_MULTI_THREADED_H
 #define DATABASE_MULTI_THREADED_H
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/os/rw_lock.h"
 #include "core/os/thread.h"
 
diff --git a/modules/database_sqlite/sqlite3_query_result.h b/modules/database_sqlite/sqlite3_query_result.h
index 1838b9e87..9f2f50fdf 100644
--- a/modules/database_sqlite/sqlite3_query_result.h
+++ b/modules/database_sqlite/sqlite3_query_result.h
@@ -2,7 +2,7 @@
 #define SQLITE3_QUERY_RESULT_H
 
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../database/query_result.h"
 
diff --git a/modules/entity_spell_system/data/items/craft_recipe.h b/modules/entity_spell_system/data/items/craft_recipe.h
index 251a95ab1..6fd792129 100644
--- a/modules/entity_spell_system/data/items/craft_recipe.h
+++ b/modules/entity_spell_system/data/items/craft_recipe.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/resource.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "item_template.h"
 
diff --git a/modules/entity_spell_system/data/items/item_instance.h b/modules/entity_spell_system/data/items/item_instance.h
index 0d805a1de..876d8cf27 100644
--- a/modules/entity_spell_system/data/items/item_instance.h
+++ b/modules/entity_spell_system/data/items/item_instance.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../../item_enums.h"
 
diff --git a/modules/entity_spell_system/data/items/item_template.h b/modules/entity_spell_system/data/items/item_template.h
index 6c46f0ffa..6a9ba5b65 100644
--- a/modules/entity_spell_system/data/items/item_template.h
+++ b/modules/entity_spell_system/data/items/item_template.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/resources/texture.h"
 
diff --git a/modules/entity_spell_system/data/loot/loot_data_base.h b/modules/entity_spell_system/data/loot/loot_data_base.h
index 24cfdb21b..80d765902 100644
--- a/modules/entity_spell_system/data/loot/loot_data_base.h
+++ b/modules/entity_spell_system/data/loot/loot_data_base.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/array.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../items/item_template.h"
 
diff --git a/modules/entity_spell_system/data/species/entity_species_data.h b/modules/entity_spell_system/data/species/entity_species_data.h
index c7b53f551..9c2d9fe83 100644
--- a/modules/entity_spell_system/data/species/entity_species_data.h
+++ b/modules/entity_spell_system/data/species/entity_species_data.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/resource.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../../entity_enums.h"
 
diff --git a/modules/entity_spell_system/data/species/species_model_data.h b/modules/entity_spell_system/data/species/species_model_data.h
index d39c8afd5..a59c52bcd 100644
--- a/modules/entity_spell_system/data/species/species_model_data.h
+++ b/modules/entity_spell_system/data/species/species_model_data.h
@@ -25,7 +25,7 @@ SOFTWARE.
 #include "core/math/color.h"
 #include "core/resource.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/resources/packed_scene.h"
 
diff --git a/modules/entity_spell_system/database/ess_resource_db.h b/modules/entity_spell_system/database/ess_resource_db.h
index d14b7cb05..bc6a1c8ee 100644
--- a/modules/entity_spell_system/database/ess_resource_db.h
+++ b/modules/entity_spell_system/database/ess_resource_db.h
@@ -23,11 +23,11 @@ SOFTWARE.
 */
 
 #include "core/bind/core_bind.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/resource.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../item_enums.h"
 
diff --git a/modules/entity_spell_system/database/ess_resource_db_folders.h b/modules/entity_spell_system/database/ess_resource_db_folders.h
index 0a234ca39..8f24a232f 100644
--- a/modules/entity_spell_system/database/ess_resource_db_folders.h
+++ b/modules/entity_spell_system/database/ess_resource_db_folders.h
@@ -25,10 +25,10 @@ SOFTWARE.
 #include "core/array.h"
 #include "core/bind/core_bind.h"
 #include "core/engine.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "ess_resource_db_map.h"
 
diff --git a/modules/entity_spell_system/database/ess_resource_db_map.h b/modules/entity_spell_system/database/ess_resource_db_map.h
index f6d25ee07..863c3464d 100644
--- a/modules/entity_spell_system/database/ess_resource_db_map.h
+++ b/modules/entity_spell_system/database/ess_resource_db_map.h
@@ -27,10 +27,10 @@ SOFTWARE.
 #include "core/array.h"
 #include "core/bind/core_bind.h"
 #include "core/engine.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/main/node.h"
 
diff --git a/modules/entity_spell_system/database/ess_resource_db_static.h b/modules/entity_spell_system/database/ess_resource_db_static.h
index f4c29bd69..492089da4 100644
--- a/modules/entity_spell_system/database/ess_resource_db_static.h
+++ b/modules/entity_spell_system/database/ess_resource_db_static.h
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 
 #include "ess_resource_db.h"
 
diff --git a/modules/entity_spell_system/entities/data/character_spec.h b/modules/entity_spell_system/entities/data/character_spec.h
index 192e8f8fc..870a2b19b 100644
--- a/modules/entity_spell_system/entities/data/character_spec.h
+++ b/modules/entity_spell_system/entities/data/character_spec.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/resource.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Spell;
 
diff --git a/modules/entity_spell_system/entities/data/entity_class_data.h b/modules/entity_spell_system/entities/data/entity_class_data.h
index b18ad527a..a4536b83b 100644
--- a/modules/entity_spell_system/entities/data/entity_class_data.h
+++ b/modules/entity_spell_system/entities/data/entity_class_data.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/resource.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/math_funcs.h"
 #include "scene/resources/texture.h"
diff --git a/modules/entity_spell_system/entities/data/entity_data.h b/modules/entity_spell_system/entities/data/entity_data.h
index 35a661fc0..cb3cd2653 100644
--- a/modules/entity_spell_system/entities/data/entity_data.h
+++ b/modules/entity_spell_system/entities/data/entity_data.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/resource.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/resources/texture.h"
 
diff --git a/modules/entity_spell_system/entities/entity.h b/modules/entity_spell_system/entities/entity.h
index fdce41721..ce6bc7daf 100644
--- a/modules/entity_spell_system/entities/entity.h
+++ b/modules/entity_spell_system/entities/entity.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/object.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/io/networked_multiplayer_peer.h"
 
diff --git a/modules/entity_spell_system/inventory/bag.h b/modules/entity_spell_system/inventory/bag.h
index 6357ef7ad..51be95f22 100644
--- a/modules/entity_spell_system/inventory/bag.h
+++ b/modules/entity_spell_system/inventory/bag.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../item_enums.h"
 
diff --git a/modules/entity_spell_system/inventory/grid_bag.h b/modules/entity_spell_system/inventory/grid_bag.h
index f6ee8c0c3..e24d88db7 100644
--- a/modules/entity_spell_system/inventory/grid_bag.h
+++ b/modules/entity_spell_system/inventory/grid_bag.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../item_enums.h"
 
diff --git a/modules/entity_spell_system/inventory/inventory.h b/modules/entity_spell_system/inventory/inventory.h
index 3759dea42..6c6308454 100644
--- a/modules/entity_spell_system/inventory/inventory.h
+++ b/modules/entity_spell_system/inventory/inventory.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../item_enums.h"
 
diff --git a/modules/entity_spell_system/inventory/normal_bag.h b/modules/entity_spell_system/inventory/normal_bag.h
index e716f9d0c..6ce84d46a 100644
--- a/modules/entity_spell_system/inventory/normal_bag.h
+++ b/modules/entity_spell_system/inventory/normal_bag.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../item_enums.h"
 
diff --git a/modules/entity_spell_system/material_cache/ess_material_cache.h b/modules/entity_spell_system/material_cache/ess_material_cache.h
index eb192692c..d69f95f07 100644
--- a/modules/entity_spell_system/material_cache/ess_material_cache.h
+++ b/modules/entity_spell_system/material_cache/ess_material_cache.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "core/os/mutex.h"
diff --git a/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h b/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h
index 5871d6fc4..e48a8c13a 100644
--- a/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h
+++ b/modules/entity_spell_system/material_cache/ess_material_cache_pcm.h
@@ -26,7 +26,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
diff --git a/modules/entity_spell_system/profiles/actionbar/action_bar_entry.h b/modules/entity_spell_system/profiles/actionbar/action_bar_entry.h
index 62447ee19..8e8c4c927 100644
--- a/modules/entity_spell_system/profiles/actionbar/action_bar_entry.h
+++ b/modules/entity_spell_system/profiles/actionbar/action_bar_entry.h
@@ -25,7 +25,7 @@ SOFTWARE.
 #include "core/array.h"
 #include "core/dictionary.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "action_bar_button_entry.h"
 
diff --git a/modules/entity_spell_system/profiles/actionbar/action_bar_profile.h b/modules/entity_spell_system/profiles/actionbar/action_bar_profile.h
index 1634d4b21..b16d2b65f 100644
--- a/modules/entity_spell_system/profiles/actionbar/action_bar_profile.h
+++ b/modules/entity_spell_system/profiles/actionbar/action_bar_profile.h
@@ -26,7 +26,7 @@ SOFTWARE.
 #include "core/dictionary.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "action_bar_entry.h"
 
diff --git a/modules/entity_spell_system/profiles/input/input_profile_modifier.h b/modules/entity_spell_system/profiles/input/input_profile_modifier.h
index 396b7fde2..05fa23fa9 100644
--- a/modules/entity_spell_system/profiles/input/input_profile_modifier.h
+++ b/modules/entity_spell_system/profiles/input/input_profile_modifier.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "input_profile_modifier_entry.h"
 
diff --git a/modules/entity_spell_system/singletons/profile_manager.h b/modules/entity_spell_system/singletons/profile_manager.h
index 4bf687e6a..18aa6a149 100644
--- a/modules/entity_spell_system/singletons/profile_manager.h
+++ b/modules/entity_spell_system/singletons/profile_manager.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/object.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../profiles/player_profile.h"
 
diff --git a/modules/entity_spell_system/skeleton/character_skeleton_2d.h b/modules/entity_spell_system/skeleton/character_skeleton_2d.h
index ab224a145..8451df446 100644
--- a/modules/entity_spell_system/skeleton/character_skeleton_2d.h
+++ b/modules/entity_spell_system/skeleton/character_skeleton_2d.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/node_path.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/2d/node_2d.h"
 
diff --git a/modules/entity_spell_system/skeleton/character_skeleton_3d.h b/modules/entity_spell_system/skeleton/character_skeleton_3d.h
index af883fca4..b3c303057 100644
--- a/modules/entity_spell_system/skeleton/character_skeleton_3d.h
+++ b/modules/entity_spell_system/skeleton/character_skeleton_3d.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/node_path.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/main/node.h"
 
diff --git a/modules/fastnoise/noise.h b/modules/fastnoise/noise.h
index 032a5fcf1..5ffa0b16b 100644
--- a/modules/fastnoise/noise.h
+++ b/modules/fastnoise/noise.h
@@ -6,7 +6,7 @@
 
 #include "lib/FastNoise.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 typedef fastnoise::FastNoise _FastNoise;
 
diff --git a/modules/gdscript/gdscript_compiler.h b/modules/gdscript/gdscript_compiler.h
index 5e923cc8f..e965c1745 100644
--- a/modules/gdscript/gdscript_compiler.h
+++ b/modules/gdscript/gdscript_compiler.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/set.h"
+#include "core/containers/set.h"
 #include "gdscript.h"
 #include "gdscript_parser.h"
 
diff --git a/modules/gdscript/gdscript_function.h b/modules/gdscript/gdscript_function.h
index f2c0840f6..beceee66e 100644
--- a/modules/gdscript/gdscript_function.h
+++ b/modules/gdscript/gdscript_function.h
@@ -34,7 +34,7 @@
 #include "core/pair.h"
 #include "core/reference.h"
 #include "core/script_language.h"
-#include "core/self_list.h"
+#include "core/containers/self_list.h"
 #include "core/string_name.h"
 #include "core/variant.h"
 
diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h
index 71d8572b0..33e257e49 100644
--- a/modules/gdscript/gdscript_parser.h
+++ b/modules/gdscript/gdscript_parser.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/object.h"
 #include "core/script_language.h"
 #include "gdscript_functions.h"
diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp
index 2f160ff77..b337c9fbb 100644
--- a/modules/gdscript/gdscript_tokenizer.cpp
+++ b/modules/gdscript/gdscript_tokenizer.cpp
@@ -31,7 +31,7 @@
 #include "gdscript_tokenizer.h"
 
 #include "core/io/marshalls.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/print_string.h"
 #include "gdscript_functions.h"
 
diff --git a/modules/gdscript/gdscript_tokenizer.h b/modules/gdscript/gdscript_tokenizer.h
index 2a7316754..b311a11f2 100644
--- a/modules/gdscript/gdscript_tokenizer.h
+++ b/modules/gdscript/gdscript_tokenizer.h
@@ -34,7 +34,7 @@
 #include "core/string_name.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vmap.h"
+#include "core/containers/vmap.h"
 #include "gdscript_functions.h"
 
 class GDScriptTokenizer {
diff --git a/modules/gltf/gltf_state.h b/modules/gltf/gltf_state.h
index cc33c3a0b..4f5a33aab 100644
--- a/modules/gltf/gltf_state.h
+++ b/modules/gltf/gltf_state.h
@@ -30,9 +30,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/animation/animation_player.h"
 #include "scene/resources/texture.h"
 
diff --git a/modules/material_maker/algos/mm_algos.h b/modules/material_maker/algos/mm_algos.h
index 5698d58d0..d87d4bfd5 100644
--- a/modules/material_maker/algos/mm_algos.h
+++ b/modules/material_maker/algos/mm_algos.h
@@ -4,7 +4,7 @@
 #include "core/math/color.h"
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/variant.h"
 
 #include "core/reference.h"
diff --git a/modules/material_maker/algos/mm_algos_bind.h b/modules/material_maker/algos/mm_algos_bind.h
index 0bff3f4a3..545e6e973 100644
--- a/modules/material_maker/algos/mm_algos_bind.h
+++ b/modules/material_maker/algos/mm_algos_bind.h
@@ -4,7 +4,7 @@
 #include "core/math/color.h"
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/variant.h"
 
 #include "core/object.h"
diff --git a/modules/material_maker/editor/mat_maker_gd_editor.h b/modules/material_maker/editor/mat_maker_gd_editor.h
index c11c33535..3171d68eb 100644
--- a/modules/material_maker/editor/mat_maker_gd_editor.h
+++ b/modules/material_maker/editor/mat_maker_gd_editor.h
@@ -6,7 +6,7 @@
 #include "core/reference.h"
 #include "core/undo_redo.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "modules/material_maker/editor/mm_create_name_popup.h"
 #include "scene/gui/margin_container.h"
diff --git a/modules/material_maker/editor/mm_create_name_popup.h b/modules/material_maker/editor/mm_create_name_popup.h
index 22b3a143c..3f4b586a9 100644
--- a/modules/material_maker/editor/mm_create_name_popup.h
+++ b/modules/material_maker/editor/mm_create_name_popup.h
@@ -6,7 +6,7 @@
 #include "core/reference.h"
 #include "core/undo_redo.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/gui/dialogs.h"
 
diff --git a/modules/material_maker/editor/mm_graph_node.h b/modules/material_maker/editor/mm_graph_node.h
index 595d91eec..c59da8d3e 100644
--- a/modules/material_maker/editor/mm_graph_node.h
+++ b/modules/material_maker/editor/mm_graph_node.h
@@ -5,7 +5,7 @@
 #include "core/reference.h"
 #include "core/undo_redo.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/gui/graph_node.h"
 
diff --git a/modules/material_maker/editor/widgets/curve_edit/curve_view.cpp b/modules/material_maker/editor/widgets/curve_edit/curve_view.cpp
index 21f2a56dd..d7dc3aa8b 100644
--- a/modules/material_maker/editor/widgets/curve_edit/curve_view.cpp
+++ b/modules/material_maker/editor/widgets/curve_edit/curve_view.cpp
@@ -2,7 +2,7 @@
 #include "curve_view.h"
 
 #include "../../../nodes/bases/curve_base.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 bool CurveView::get_show_axes() const {
 	return show_axes;
diff --git a/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.h b/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.h
index 602a5eb15..969f6b053 100644
--- a/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.h
+++ b/modules/material_maker/editor/widgets/gradient_editor/gradient_editor.h
@@ -6,7 +6,7 @@
 #include "core/reference.h"
 #include "core/undo_redo.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/gui/control.h"
 
diff --git a/modules/material_maker/nodes/bases/curve_base.h b/modules/material_maker/nodes/bases/curve_base.h
index 42b50bc14..f44188051 100644
--- a/modules/material_maker/nodes/bases/curve_base.h
+++ b/modules/material_maker/nodes/bases/curve_base.h
@@ -5,7 +5,7 @@
 #include "core/math/math_funcs.h"
 #include "core/math/vector2.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../mm_node.h"
 
diff --git a/modules/material_maker/nodes/mm_material.h b/modules/material_maker/nodes/mm_material.h
index 70351ffb2..a09076ace 100644
--- a/modules/material_maker/nodes/mm_material.h
+++ b/modules/material_maker/nodes/mm_material.h
@@ -6,7 +6,7 @@
 #include "core/math/vector3.h"
 #include "core/reference.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/resource.h"
 
diff --git a/modules/mbedtls/ssl_context_mbedtls.h b/modules/mbedtls/ssl_context_mbedtls.h
index 40529dee6..15750eac0 100644
--- a/modules/mbedtls/ssl_context_mbedtls.h
+++ b/modules/mbedtls/ssl_context_mbedtls.h
@@ -33,7 +33,7 @@
 #include "crypto_mbedtls.h"
 
 #include "core/os/file_access.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
 
 #include <mbedtls/config.h>
diff --git a/modules/mesh_data_resource/editor/mdi_gizmo.h b/modules/mesh_data_resource/editor/mdi_gizmo.h
index 1e58d3a7d..18d2ff636 100644
--- a/modules/mesh_data_resource/editor/mdi_gizmo.h
+++ b/modules/mesh_data_resource/editor/mdi_gizmo.h
@@ -28,7 +28,7 @@ SOFTWARE.
 #include "core/math/basis.h"
 #include "core/math/transform.h"
 #include "core/math/vector3.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
 #include "core/variant.h"
 
diff --git a/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_decompose.h b/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_decompose.h
index 49b2e3c55..0878cbd13 100644
--- a/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_decompose.h
+++ b/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_decompose.h
@@ -24,10 +24,10 @@ SOFTWARE.
 */
 
 #include "core/array.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class MeshDataResource;
 
diff --git a/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_outline.h b/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_outline.h
index 944985976..5cade56f3 100644
--- a/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_outline.h
+++ b/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_outline.h
@@ -26,7 +26,7 @@ SOFTWARE.
 #include "core/reference.h"
 
 #include "core/array.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/variant.h"
 
 class MeshDataResource;
diff --git a/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_utils.h b/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_utils.h
index 67230a3d9..b1ab8dfc6 100644
--- a/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_utils.h
+++ b/modules/mesh_data_resource/editor/utilities/mdr_ed_mesh_utils.h
@@ -24,7 +24,7 @@ SOFTWARE.
 */
 
 #include "core/ustring.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/math/vector3.h"
 #include "core/reference.h"
 #include "core/array.h"
diff --git a/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view.h b/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view.h
index 9b17c997e..0e54fbd3a 100644
--- a/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view.h
+++ b/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view.h
@@ -24,7 +24,7 @@ SOFTWARE.
 */
 
 #include "core/math/rect2.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
 #include "scene/gui/control.h"
 
diff --git a/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.h b/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.h
index 7f64a7047..64a12c7c1 100644
--- a/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.h
+++ b/modules/mesh_data_resource/editor/uv_editor/mdr_uv_rect_view_node.h
@@ -25,7 +25,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/math/rect2.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
 
 #include "scene/gui/margin_container.h"
diff --git a/modules/mesh_data_resource/mesh_data_resource.h b/modules/mesh_data_resource/mesh_data_resource.h
index 2627544ab..541576323 100644
--- a/modules/mesh_data_resource/mesh_data_resource.h
+++ b/modules/mesh_data_resource/mesh_data_resource.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/array.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/resource.h"
 #include "core/variant.h"
 
diff --git a/modules/mesh_data_resource/mesh_data_resource_collection.h b/modules/mesh_data_resource/mesh_data_resource_collection.h
index eb20c1cc6..f84b40983 100644
--- a/modules/mesh_data_resource/mesh_data_resource_collection.h
+++ b/modules/mesh_data_resource/mesh_data_resource_collection.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "mesh_data_resource.h"
 
diff --git a/modules/mesh_utils/fqms.h b/modules/mesh_utils/fqms.h
index b1d7227f0..2320ec02c 100644
--- a/modules/mesh_utils/fqms.h
+++ b/modules/mesh_utils/fqms.h
@@ -27,10 +27,10 @@ SOFTWARE.
 */
 
 #include "core/math/color.h"
-#include "core/hashfuncs.h"
+#include "core/containers/hashfuncs.h"
 #include "core/math/vector2.h"
 #include "core/math/vector3.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 namespace FQMS {
 
diff --git a/modules/mesh_utils/mesh_merger.h b/modules/mesh_utils/mesh_merger.h
index 485271960..bd8e05d9a 100644
--- a/modules/mesh_utils/mesh_merger.h
+++ b/modules/mesh_utils/mesh_merger.h
@@ -26,11 +26,11 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "defines.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "scene/3d/mesh_instance.h"
 
 #include "core/math/rect2.h"
diff --git a/modules/mesh_utils/mesh_utils.cpp b/modules/mesh_utils/mesh_utils.cpp
index ad96ccc01..028f3f44d 100644
--- a/modules/mesh_utils/mesh_utils.cpp
+++ b/modules/mesh_utils/mesh_utils.cpp
@@ -21,7 +21,7 @@ SOFTWARE.
 */
 
 #include "mesh_utils.h"
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/variant.h"
 #include "scene/resources/mesh.h"
 
diff --git a/modules/navigation/nav_map.h b/modules/navigation/nav_map.h
index ca4620bfc..519db5114 100644
--- a/modules/navigation/nav_map.h
+++ b/modules/navigation/nav_map.h
@@ -33,7 +33,7 @@
 
 #include "nav_rid.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/math/math_defs.h"
 #include "core/os/thread_work_pool.h"
 #include "nav_utils.h"
diff --git a/modules/network_synchronizer/interpolator.h b/modules/network_synchronizer/interpolator.h
index f85197020..42d74256f 100644
--- a/modules/network_synchronizer/interpolator.h
+++ b/modules/network_synchronizer/interpolator.h
@@ -36,7 +36,7 @@
 */
 
 #include "core/class_db.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Interpolator : public Object {
 	GDCLASS(Interpolator, Object);
diff --git a/modules/network_synchronizer/net_utilities.h b/modules/network_synchronizer/net_utilities.h
index cab1370ef..ada904c21 100644
--- a/modules/network_synchronizer/net_utilities.h
+++ b/modules/network_synchronizer/net_utilities.h
@@ -36,7 +36,7 @@
 */
 
 #include "core/math/math_funcs.h"
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/variant.h"
 
 #ifdef DEBUG_ENABLED
diff --git a/modules/network_synchronizer/scene_diff.h b/modules/network_synchronizer/scene_diff.h
index 98793c920..091c8563f 100644
--- a/modules/network_synchronizer/scene_diff.h
+++ b/modules/network_synchronizer/scene_diff.h
@@ -36,7 +36,7 @@
 */
 
 #include "core/class_db.h"
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "net_utilities.h"
 
 class SceneSynchronizer;
diff --git a/modules/network_synchronizer/scene_synchronizer.h b/modules/network_synchronizer/scene_synchronizer.h
index 453a3594f..f639966ba 100644
--- a/modules/network_synchronizer/scene_synchronizer.h
+++ b/modules/network_synchronizer/scene_synchronizer.h
@@ -37,8 +37,8 @@
 
 #include "scene/main/node.h"
 
-#include "core/local_vector.h"
-#include "core/oa_hash_map.h"
+#include "core/containers/local_vector.h"
+#include "core/containers/oa_hash_map.h"
 #include "net_utilities.h"
 #include <deque>
 
diff --git a/modules/paint/actions/paint_action.h b/modules/paint/actions/paint_action.h
index 811e218d8..7f7318f80 100644
--- a/modules/paint/actions/paint_action.h
+++ b/modules/paint/actions/paint_action.h
@@ -30,7 +30,7 @@ SOFTWARE.
 #include "core/array.h"
 #include "core/dictionary.h"
 #include "core/math/vector2i.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/variant.h"
 
 class PaintCanvas;
diff --git a/modules/paint/bush_prefabs.h b/modules/paint/bush_prefabs.h
index 9f2695091..2173efe59 100644
--- a/modules/paint/bush_prefabs.h
+++ b/modules/paint/bush_prefabs.h
@@ -27,7 +27,7 @@ SOFTWARE.
 
 #include "scene/gui/control.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/variant.h"
 
 class BrushPrefabs {
diff --git a/modules/paint/paint_canvas.h b/modules/paint/paint_canvas.h
index 46c4578a5..471738126 100644
--- a/modules/paint/paint_canvas.h
+++ b/modules/paint/paint_canvas.h
@@ -28,7 +28,7 @@ SOFTWARE.
 #include "core/reference.h"
 #include "scene/gui/margin_container.h"
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class PaintCanvasLayer;
 class TextureRect;
diff --git a/modules/paint/paint_utilities.h b/modules/paint/paint_utilities.h
index 989ec61a8..80e79ac4f 100644
--- a/modules/paint/paint_utilities.h
+++ b/modules/paint/paint_utilities.h
@@ -27,7 +27,7 @@ SOFTWARE.
 
 #include "core/object.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/variant.h"
 
 //class_name GEUtils
diff --git a/modules/paint/paint_window.h b/modules/paint/paint_window.h
index 21b9df91a..70f512cf9 100644
--- a/modules/paint/paint_window.h
+++ b/modules/paint/paint_window.h
@@ -28,7 +28,7 @@ SOFTWARE.
 #include "scene/gui/control.h"
 
 #include "bush_prefabs.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/os/keyboard.h"
 #include "core/reference.h"
 
diff --git a/modules/plugin_refresher/plugin_refresher.h b/modules/plugin_refresher/plugin_refresher.h
index 058e87e04..cea02d67c 100644
--- a/modules/plugin_refresher/plugin_refresher.h
+++ b/modules/plugin_refresher/plugin_refresher.h
@@ -4,7 +4,7 @@
 #include "core/reference.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/gui/tool_button.h"
 
diff --git a/modules/props/clutter/ground_clutter_foliage.h b/modules/props/clutter/ground_clutter_foliage.h
index 767d1d48a..56df4c864 100644
--- a/modules/props/clutter/ground_clutter_foliage.h
+++ b/modules/props/clutter/ground_clutter_foliage.h
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "ground_clutter.h"
 
diff --git a/modules/props/lights/prop_light.h b/modules/props/lights/prop_light.h
index 632bf481d..6eaf3747a 100644
--- a/modules/props/lights/prop_light.h
+++ b/modules/props/lights/prop_light.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class PropLight : public Reference {
 	GDCLASS(PropLight, Reference);
diff --git a/modules/props/material_cache/prop_material_cache.h b/modules/props/material_cache/prop_material_cache.h
index d1298f39e..e14cae78b 100644
--- a/modules/props/material_cache/prop_material_cache.h
+++ b/modules/props/material_cache/prop_material_cache.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "core/os/mutex.h"
diff --git a/modules/props/material_cache/prop_material_cache_pcm.h b/modules/props/material_cache/prop_material_cache_pcm.h
index ff08a9cbf..bed7e2523 100644
--- a/modules/props/material_cache/prop_material_cache_pcm.h
+++ b/modules/props/material_cache/prop_material_cache_pcm.h
@@ -26,7 +26,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
diff --git a/modules/props/prop_mesher.h b/modules/props/prop_mesher.h
index fa2c84db2..b4d055a17 100644
--- a/modules/props/prop_mesher.h
+++ b/modules/props/prop_mesher.h
@@ -23,9 +23,9 @@ SOFTWARE.
 */
 
 #include "core/math/color.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/3d/mesh_instance.h"
 
 #include "core/math/rect2.h"
diff --git a/modules/props/props/prop_data.h b/modules/props/props/prop_data.h
index a77704d9c..7aa2cb95f 100644
--- a/modules/props/props/prop_data.h
+++ b/modules/props/props/prop_data.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/math/transform.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
diff --git a/modules/props/singleton/prop_cache.cpp b/modules/props/singleton/prop_cache.cpp
index e6cd75e69..5dd66c68d 100644
--- a/modules/props/singleton/prop_cache.cpp
+++ b/modules/props/singleton/prop_cache.cpp
@@ -37,7 +37,7 @@ SOFTWARE.
 #include "../material_cache/prop_material_cache.h"
 #include "../tiled_wall/tiled_wall_data.h"
 
-#include "core/hashfuncs.h"
+#include "core/containers/hashfuncs.h"
 
 #define VARIANT_ARRAY_GET(arr)             \
 	Vector<Variant> r;                     \
diff --git a/modules/props/singleton/prop_cache.h b/modules/props/singleton/prop_cache.h
index 19b07043e..9d7332df7 100644
--- a/modules/props/singleton/prop_cache.h
+++ b/modules/props/singleton/prop_cache.h
@@ -24,10 +24,10 @@ SOFTWARE.
 
 #include "core/bind/core_bind.h"
 #include "core/math/color.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/object.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/resources/material.h"
 
diff --git a/modules/props/singleton/prop_utils.h b/modules/props/singleton/prop_utils.h
index e2e78404c..0b90eb983 100644
--- a/modules/props/singleton/prop_utils.h
+++ b/modules/props/singleton/prop_utils.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/object.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/3d/spatial.h"
 
 #include "scene/main/node.h"
diff --git a/modules/props/tiled_wall/tiled_wall_data.h b/modules/props/tiled_wall/tiled_wall_data.h
index 58680c821..623b3fdec 100644
--- a/modules/props/tiled_wall/tiled_wall_data.h
+++ b/modules/props/tiled_wall/tiled_wall_data.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "core/math/transform.h"
diff --git a/modules/props_2d/clutter/ground_clutter_2d_foliage.h b/modules/props_2d/clutter/ground_clutter_2d_foliage.h
index 997fea877..06abc6029 100644
--- a/modules/props_2d/clutter/ground_clutter_2d_foliage.h
+++ b/modules/props_2d/clutter/ground_clutter_2d_foliage.h
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "ground_clutter_2d.h"
 
diff --git a/modules/props_2d/lights/prop_2d_light.h b/modules/props_2d/lights/prop_2d_light.h
index 6d316eb8a..7fe040941 100644
--- a/modules/props_2d/lights/prop_2d_light.h
+++ b/modules/props_2d/lights/prop_2d_light.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Prop2DLight : public Reference {
 	GDCLASS(Prop2DLight, Reference);
diff --git a/modules/props_2d/material_cache/prop_2d_material_cache.h b/modules/props_2d/material_cache/prop_2d_material_cache.h
index db4fadae5..3cbbbc91d 100644
--- a/modules/props_2d/material_cache/prop_2d_material_cache.h
+++ b/modules/props_2d/material_cache/prop_2d_material_cache.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "core/os/mutex.h"
diff --git a/modules/props_2d/material_cache/prop_2d_material_cache_pcm.h b/modules/props_2d/material_cache/prop_2d_material_cache_pcm.h
index d4859dcee..0bb00805d 100644
--- a/modules/props_2d/material_cache/prop_2d_material_cache_pcm.h
+++ b/modules/props_2d/material_cache/prop_2d_material_cache_pcm.h
@@ -26,7 +26,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
diff --git a/modules/props_2d/prop_2d_mesher.h b/modules/props_2d/prop_2d_mesher.h
index 762f08ae5..5884d67bb 100644
--- a/modules/props_2d/prop_2d_mesher.h
+++ b/modules/props_2d/prop_2d_mesher.h
@@ -23,9 +23,9 @@ SOFTWARE.
 */
 
 #include "core/math/color.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/3d/mesh_instance.h"
 
 #include "core/math/rect2.h"
diff --git a/modules/props_2d/props/prop_2d_data.h b/modules/props_2d/props/prop_2d_data.h
index 9f0a281a2..e38cb9047 100644
--- a/modules/props_2d/props/prop_2d_data.h
+++ b/modules/props_2d/props/prop_2d_data.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/math/transform.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "core/math/vector2.h"
diff --git a/modules/props_2d/singleton/prop_2d_cache.cpp b/modules/props_2d/singleton/prop_2d_cache.cpp
index 28b39a2ad..c1ee9c030 100644
--- a/modules/props_2d/singleton/prop_2d_cache.cpp
+++ b/modules/props_2d/singleton/prop_2d_cache.cpp
@@ -37,7 +37,7 @@ SOFTWARE.
 #include "../material_cache/prop_2d_material_cache.h"
 #include "../tiled_wall/tiled_wall_2d_data.h"
 
-#include "core/hashfuncs.h"
+#include "core/containers/hashfuncs.h"
 
 #define VARIANT_ARRAY_GET(arr)             \
 	Vector<Variant> r;                     \
diff --git a/modules/props_2d/singleton/prop_2d_cache.h b/modules/props_2d/singleton/prop_2d_cache.h
index ef2449591..4a63a8938 100644
--- a/modules/props_2d/singleton/prop_2d_cache.h
+++ b/modules/props_2d/singleton/prop_2d_cache.h
@@ -24,10 +24,10 @@ SOFTWARE.
 
 #include "core/bind/core_bind.h"
 #include "core/math/color.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/object.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/resources/material.h"
 
diff --git a/modules/props_2d/singleton/prop_2d_utils.h b/modules/props_2d/singleton/prop_2d_utils.h
index f537f5469..2cfb0af90 100644
--- a/modules/props_2d/singleton/prop_2d_utils.h
+++ b/modules/props_2d/singleton/prop_2d_utils.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/object.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/3d/spatial.h"
 
 #include "scene/main/node.h"
diff --git a/modules/props_2d/tiled_wall/tiled_wall_2d_data.h b/modules/props_2d/tiled_wall/tiled_wall_2d_data.h
index 6f5eb091a..a3af994de 100644
--- a/modules/props_2d/tiled_wall/tiled_wall_2d_data.h
+++ b/modules/props_2d/tiled_wall/tiled_wall_2d_data.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "core/math/transform.h"
diff --git a/modules/regex/regex.h b/modules/regex/regex.h
index bfb41ea29..5309b664a 100644
--- a/modules/regex/regex.h
+++ b/modules/regex/regex.h
@@ -32,10 +32,10 @@
 
 #include "core/array.h"
 #include "core/dictionary.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class RegExMatch : public Reference {
 	GDCLASS(RegExMatch, Reference);
diff --git a/modules/rtile_map/tile_map.h b/modules/rtile_map/tile_map.h
index 248ce3bb3..9eb833d1d 100644
--- a/modules/rtile_map/tile_map.h
+++ b/modules/rtile_map/tile_map.h
@@ -30,8 +30,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/self_list.h"
-#include "core/vset.h"
+#include "core/containers/self_list.h"
+#include "core/containers/vset.h"
 #include "scene/2d/navigation_2d.h"
 #include "scene/2d/node_2d.h"
 #include "tile_set.h"
diff --git a/modules/terraman/data/terrain_light.h b/modules/terraman/data/terrain_light.h
index 61d7d4057..a6b45f67c 100644
--- a/modules/terraman/data/terrain_light.h
+++ b/modules/terraman/data/terrain_light.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class TerrainLight : public Reference {
 	GDCLASS(TerrainLight, Reference);
diff --git a/modules/terraman/library/terrain_library_merger.h b/modules/terraman/library/terrain_library_merger.h
index 4a4138cfa..2d66c6bdd 100644
--- a/modules/terraman/library/terrain_library_merger.h
+++ b/modules/terraman/library/terrain_library_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/map.h"
+#include "core/containers/map.h"
 #include "core/resource.h"
 
 #include "terrain_library.h"
diff --git a/modules/terraman/library/terrain_library_merger_pcm.cpp b/modules/terraman/library/terrain_library_merger_pcm.cpp
index 9a9457094..515cff731 100644
--- a/modules/terraman/library/terrain_library_merger_pcm.cpp
+++ b/modules/terraman/library/terrain_library_merger_pcm.cpp
@@ -38,7 +38,7 @@ SOFTWARE.
 
 #include "../defines.h"
 #include "../world/default/terrain_chunk_default.h"
-#include "core/hashfuncs.h"
+#include "core/containers/hashfuncs.h"
 #include "core/message_queue.h"
 #include "terrain_material_cache_pcm.h"
 
diff --git a/modules/terraman/library/terrain_library_merger_pcm.h b/modules/terraman/library/terrain_library_merger_pcm.h
index 9d09a50d2..fff8b9587 100644
--- a/modules/terraman/library/terrain_library_merger_pcm.h
+++ b/modules/terraman/library/terrain_library_merger_pcm.h
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/resource.h"
 
 #include "terrain_library.h"
diff --git a/modules/terraman/library/terrain_material_cache.h b/modules/terraman/library/terrain_material_cache.h
index bf67dfef8..1c9c6951e 100644
--- a/modules/terraman/library/terrain_material_cache.h
+++ b/modules/terraman/library/terrain_material_cache.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
diff --git a/modules/terraman/library/terrain_material_cache_pcm.h b/modules/terraman/library/terrain_material_cache_pcm.h
index f6212f191..972a0648c 100644
--- a/modules/terraman/library/terrain_material_cache_pcm.h
+++ b/modules/terraman/library/terrain_material_cache_pcm.h
@@ -26,7 +26,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
diff --git a/modules/terraman/library/terrain_surface.h b/modules/terraman/library/terrain_surface.h
index 8b2a2a159..4538a5cb8 100644
--- a/modules/terraman/library/terrain_surface.h
+++ b/modules/terraman/library/terrain_surface.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
diff --git a/modules/terraman/meshers/terrain_mesher.h b/modules/terraman/meshers/terrain_mesher.h
index 3a3e97e02..53bcbed1f 100644
--- a/modules/terraman/meshers/terrain_mesher.h
+++ b/modules/terraman/meshers/terrain_mesher.h
@@ -24,11 +24,11 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../defines.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 #include "scene/3d/mesh_instance.h"
 
diff --git a/modules/terraman/world/block_terrain_structure.h b/modules/terraman/world/block_terrain_structure.h
index 66b010b9c..9a334120b 100644
--- a/modules/terraman/world/block_terrain_structure.h
+++ b/modules/terraman/world/block_terrain_structure.h
@@ -22,13 +22,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "terrain_structure.h"
 
 #include "../defines.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 #include "terrain_chunk.h"
 
diff --git a/modules/terraman/world/jobs/terrain_terrain_job.h b/modules/terraman/world/jobs/terrain_terrain_job.h
index 213ec7882..07d15fb57 100644
--- a/modules/terraman/world/jobs/terrain_terrain_job.h
+++ b/modules/terraman/world/jobs/terrain_terrain_job.h
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include "../../defines.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 class TerrainMesher;
 
diff --git a/modules/terraman/world/terrain_chunk.h b/modules/terraman/world/terrain_chunk.h
index f1f02529f..5d6926d1d 100644
--- a/modules/terraman/world/terrain_chunk.h
+++ b/modules/terraman/world/terrain_chunk.h
@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "../defines.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
diff --git a/modules/terraman/world/terrain_structure.h b/modules/terraman/world/terrain_structure.h
index 0ec5756e6..ecea42473 100644
--- a/modules/terraman/world/terrain_structure.h
+++ b/modules/terraman/world/terrain_structure.h
@@ -22,12 +22,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/resource.h"
 
 #include "../defines.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 #include "core/math/aabb.h"
 #include "terrain_chunk.h"
diff --git a/modules/terraman/world/terrain_world.h b/modules/terraman/world/terrain_world.h
index 58cca3e35..0896ee23b 100644
--- a/modules/terraman/world/terrain_world.h
+++ b/modules/terraman/world/terrain_world.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/engine.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 
 #include "../defines.h"
 
diff --git a/modules/terraman_2d/data/terrain_2d_light.h b/modules/terraman_2d/data/terrain_2d_light.h
index 4a3407166..1666a8a7e 100644
--- a/modules/terraman_2d/data/terrain_2d_light.h
+++ b/modules/terraman_2d/data/terrain_2d_light.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class Terrain2DLight : public Reference {
 	GDCLASS(Terrain2DLight, Reference);
diff --git a/modules/terraman_2d/library/terrain_2d_library_merger.h b/modules/terraman_2d/library/terrain_2d_library_merger.h
index ad10ef3ff..f497634e8 100644
--- a/modules/terraman_2d/library/terrain_2d_library_merger.h
+++ b/modules/terraman_2d/library/terrain_2d_library_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/map.h"
+#include "core/containers/map.h"
 #include "core/resource.h"
 
 #include "terrain_2d_library.h"
diff --git a/modules/terraman_2d/library/terrain_2d_library_merger_pcm.cpp b/modules/terraman_2d/library/terrain_2d_library_merger_pcm.cpp
index 8f5a2dea9..c04faabc0 100644
--- a/modules/terraman_2d/library/terrain_2d_library_merger_pcm.cpp
+++ b/modules/terraman_2d/library/terrain_2d_library_merger_pcm.cpp
@@ -38,7 +38,7 @@ SOFTWARE.
 
 #include "../defines.h"
 #include "../world/default/terrain_2d_chunk_default.h"
-#include "core/hashfuncs.h"
+#include "core/containers/hashfuncs.h"
 #include "core/message_queue.h"
 #include "terrain_2d_material_cache_pcm.h"
 
diff --git a/modules/terraman_2d/library/terrain_2d_library_merger_pcm.h b/modules/terraman_2d/library/terrain_2d_library_merger_pcm.h
index 132994365..063c923e5 100644
--- a/modules/terraman_2d/library/terrain_2d_library_merger_pcm.h
+++ b/modules/terraman_2d/library/terrain_2d_library_merger_pcm.h
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/resource.h"
 
 #include "terrain_2d_library.h"
diff --git a/modules/terraman_2d/library/terrain_2d_material_cache.h b/modules/terraman_2d/library/terrain_2d_material_cache.h
index 2945df845..ba913e582 100644
--- a/modules/terraman_2d/library/terrain_2d_material_cache.h
+++ b/modules/terraman_2d/library/terrain_2d_material_cache.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
diff --git a/modules/terraman_2d/library/terrain_2d_material_cache_pcm.h b/modules/terraman_2d/library/terrain_2d_material_cache_pcm.h
index 9237d2529..88a6bb5a8 100644
--- a/modules/terraman_2d/library/terrain_2d_material_cache_pcm.h
+++ b/modules/terraman_2d/library/terrain_2d_material_cache_pcm.h
@@ -26,7 +26,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
diff --git a/modules/terraman_2d/library/terrain_2d_surface.h b/modules/terraman_2d/library/terrain_2d_surface.h
index bf94096a1..2c266f392 100644
--- a/modules/terraman_2d/library/terrain_2d_surface.h
+++ b/modules/terraman_2d/library/terrain_2d_surface.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
diff --git a/modules/terraman_2d/meshers/terrain_2d_mesher.h b/modules/terraman_2d/meshers/terrain_2d_mesher.h
index 21d6dc36e..3bf88e7bc 100644
--- a/modules/terraman_2d/meshers/terrain_2d_mesher.h
+++ b/modules/terraman_2d/meshers/terrain_2d_mesher.h
@@ -24,11 +24,11 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../defines.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "scene/3d/mesh_instance.h"
 
 #include "core/math/rect2.h"
diff --git a/modules/terraman_2d/world/block_terrain_2d_structure.h b/modules/terraman_2d/world/block_terrain_2d_structure.h
index 80a5a1440..ca3086fe0 100644
--- a/modules/terraman_2d/world/block_terrain_2d_structure.h
+++ b/modules/terraman_2d/world/block_terrain_2d_structure.h
@@ -22,13 +22,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "terrain_2d_structure.h"
 
 #include "../defines.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 #include "terrain_2d_chunk.h"
 
diff --git a/modules/terraman_2d/world/jobs/terrain_2d_terrain_job.h b/modules/terraman_2d/world/jobs/terrain_2d_terrain_job.h
index 83806c553..cc4321eb8 100644
--- a/modules/terraman_2d/world/jobs/terrain_2d_terrain_job.h
+++ b/modules/terraman_2d/world/jobs/terrain_2d_terrain_job.h
@@ -26,7 +26,7 @@ SOFTWARE.
 
 #include "../../defines.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 class Terrain2DMesher;
 
diff --git a/modules/terraman_2d/world/terrain_2d_chunk.h b/modules/terraman_2d/world/terrain_2d_chunk.h
index 1b416a4c9..88c7901e2 100644
--- a/modules/terraman_2d/world/terrain_2d_chunk.h
+++ b/modules/terraman_2d/world/terrain_2d_chunk.h
@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "../defines.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
diff --git a/modules/terraman_2d/world/terrain_2d_structure.h b/modules/terraman_2d/world/terrain_2d_structure.h
index 405c9f334..03430b46b 100644
--- a/modules/terraman_2d/world/terrain_2d_structure.h
+++ b/modules/terraman_2d/world/terrain_2d_structure.h
@@ -22,13 +22,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/resource.h"
 
 #include "../defines.h"
 
 #include "core/math/rect2.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "terrain_2d_chunk.h"
 
 class Terrain2DStructure : public Resource {
diff --git a/modules/terraman_2d/world/terrain_2d_world.h b/modules/terraman_2d/world/terrain_2d_world.h
index 601d0a334..18a4bf024 100644
--- a/modules/terraman_2d/world/terrain_2d_world.h
+++ b/modules/terraman_2d/world/terrain_2d_world.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/engine.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 
 #include "../defines.h"
 
diff --git a/modules/text_editor/text_file_editor.h b/modules/text_editor/text_file_editor.h
index 9ad216bbb..ef7e48a79 100644
--- a/modules/text_editor/text_file_editor.h
+++ b/modules/text_editor/text_file_editor.h
@@ -4,7 +4,7 @@
 #include "core/reference.h"
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/gui/control.h"
 
diff --git a/modules/texture_packer/layers/texture_layer_merger.h b/modules/texture_packer/layers/texture_layer_merger.h
index f1e231008..552c4a6e6 100644
--- a/modules/texture_packer/layers/texture_layer_merger.h
+++ b/modules/texture_packer/layers/texture_layer_merger.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/image.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "scene/resources/texture.h"
diff --git a/modules/texture_packer/texture_merger.h b/modules/texture_packer/texture_merger.h
index 94aff5d5b..6badae40f 100644
--- a/modules/texture_packer/texture_merger.h
+++ b/modules/texture_packer/texture_merger.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/engine.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/main/node.h"
 
diff --git a/modules/texture_packer/texture_packer.h b/modules/texture_packer/texture_packer.h
index cad34e3df..bc2cfd305 100644
--- a/modules/texture_packer/texture_packer.h
+++ b/modules/texture_packer/texture_packer.h
@@ -26,7 +26,7 @@ SOFTWARE.
 #include "core/image.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/resources/texture.h"
 #include <vector>
diff --git a/modules/theora/video_stream_theora.h b/modules/theora/video_stream_theora.h
index adf73252d..9aa3b5cdb 100644
--- a/modules/theora/video_stream_theora.h
+++ b/modules/theora/video_stream_theora.h
@@ -34,7 +34,7 @@
 #include "core/os/file_access.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
-#include "core/ring_buffer.h"
+#include "core/containers/ring_buffer.h"
 #include "core/safe_refcount.h"
 #include "scene/resources/video_stream.h"
 #include "servers/audio_server.h"
diff --git a/modules/thread_pool/thread_pool.h b/modules/thread_pool/thread_pool.h
index 44d207551..95847f5e0 100644
--- a/modules/thread_pool/thread_pool.h
+++ b/modules/thread_pool/thread_pool.h
@@ -26,7 +26,7 @@ SOFTWARE.
 */
 
 #include "core/object.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
diff --git a/modules/users/managers/user_manager.h b/modules/users/managers/user_manager.h
index 88c935f04..e873c69f7 100644
--- a/modules/users/managers/user_manager.h
+++ b/modules/users/managers/user_manager.h
@@ -3,7 +3,7 @@
 
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "scene/main/node.h"
 
diff --git a/modules/users/managers/user_manager_db.h b/modules/users/managers/user_manager_db.h
index 8f37555d5..48107375a 100644
--- a/modules/users/managers/user_manager_db.h
+++ b/modules/users/managers/user_manager_db.h
@@ -4,7 +4,7 @@
 #include "core/os/rw_lock.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "user_manager.h"
 
diff --git a/modules/users/managers/user_manager_file.h b/modules/users/managers/user_manager_file.h
index d11162b9e..dd114eda3 100644
--- a/modules/users/managers/user_manager_file.h
+++ b/modules/users/managers/user_manager_file.h
@@ -4,7 +4,7 @@
 #include "core/os/rw_lock.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "user_manager.h"
 
diff --git a/modules/users/managers/user_manager_static.h b/modules/users/managers/user_manager_static.h
index 6fdee7402..adff4a1df 100644
--- a/modules/users/managers/user_manager_static.h
+++ b/modules/users/managers/user_manager_static.h
@@ -4,7 +4,7 @@
 #include "core/os/rw_lock.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "user_manager.h"
 
diff --git a/modules/users/singleton/user_db.h b/modules/users/singleton/user_db.h
index 51106bde6..c30e3c4bd 100644
--- a/modules/users/singleton/user_db.h
+++ b/modules/users/singleton/user_db.h
@@ -4,7 +4,7 @@
 #include "core/os/rw_lock.h"
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/object.h"
 
diff --git a/modules/users/web/web_nodes/user_controller.h b/modules/users/web/web_nodes/user_controller.h
index 8f02cf250..9551b3a88 100644
--- a/modules/users/web/web_nodes/user_controller.h
+++ b/modules/users/web/web_nodes/user_controller.h
@@ -3,7 +3,7 @@
 
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "modules/web/http/web_node.h"
 
diff --git a/modules/users/web/web_nodes/user_delete_web_page.h b/modules/users/web/web_nodes/user_delete_web_page.h
index bf9fb6bda..5e582eac6 100644
--- a/modules/users/web/web_nodes/user_delete_web_page.h
+++ b/modules/users/web/web_nodes/user_delete_web_page.h
@@ -3,7 +3,7 @@
 
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "user_web_page.h"
 
diff --git a/modules/users/web/web_nodes/user_login_web_page.h b/modules/users/web/web_nodes/user_login_web_page.h
index 0a56cedb0..ceb1707af 100644
--- a/modules/users/web/web_nodes/user_login_web_page.h
+++ b/modules/users/web/web_nodes/user_login_web_page.h
@@ -3,7 +3,7 @@
 
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "user_web_page.h"
 
diff --git a/modules/users/web/web_nodes/user_logout_web_page.h b/modules/users/web/web_nodes/user_logout_web_page.h
index 4b13455a0..b1aa06da6 100644
--- a/modules/users/web/web_nodes/user_logout_web_page.h
+++ b/modules/users/web/web_nodes/user_logout_web_page.h
@@ -3,7 +3,7 @@
 
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "user_web_page.h"
 
diff --git a/modules/users/web/web_nodes/user_password_reset_web_page.h b/modules/users/web/web_nodes/user_password_reset_web_page.h
index e94feeeb4..edeae738a 100644
--- a/modules/users/web/web_nodes/user_password_reset_web_page.h
+++ b/modules/users/web/web_nodes/user_password_reset_web_page.h
@@ -3,7 +3,7 @@
 
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "user_web_page.h"
 
diff --git a/modules/users/web/web_nodes/user_register_web_page.h b/modules/users/web/web_nodes/user_register_web_page.h
index 7f5c384b9..0bf4ccf9b 100644
--- a/modules/users/web/web_nodes/user_register_web_page.h
+++ b/modules/users/web/web_nodes/user_register_web_page.h
@@ -3,7 +3,7 @@
 
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "user_web_page.h"
 
diff --git a/modules/users/web/web_nodes/user_settings_web_page.h b/modules/users/web/web_nodes/user_settings_web_page.h
index 2e5bc5815..d2a5c1c0b 100644
--- a/modules/users/web/web_nodes/user_settings_web_page.h
+++ b/modules/users/web/web_nodes/user_settings_web_page.h
@@ -3,7 +3,7 @@
 
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "user_web_page.h"
 
diff --git a/modules/users/web/web_nodes/user_stats_web_page.h b/modules/users/web/web_nodes/user_stats_web_page.h
index 84b1e56c2..c4f6930a8 100644
--- a/modules/users/web/web_nodes/user_stats_web_page.h
+++ b/modules/users/web/web_nodes/user_stats_web_page.h
@@ -3,7 +3,7 @@
 
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "modules/web/http/web_node.h"
 #include "user_web_page.h"
diff --git a/modules/users/web/web_nodes/user_web_page.h b/modules/users/web/web_nodes/user_web_page.h
index 9285ae263..f95239ecc 100644
--- a/modules/users/web/web_nodes/user_web_page.h
+++ b/modules/users/web/web_nodes/user_web_page.h
@@ -3,7 +3,7 @@
 
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "modules/web/http/web_node.h"
 
diff --git a/modules/voxelman/data/voxel_light.h b/modules/voxelman/data/voxel_light.h
index 218d20aa4..05ab59e60 100644
--- a/modules/voxelman/data/voxel_light.h
+++ b/modules/voxelman/data/voxel_light.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class VoxelLight : public Reference {
 	GDCLASS(VoxelLight, Reference);
diff --git a/modules/voxelman/library/voxel_library_merger.h b/modules/voxelman/library/voxel_library_merger.h
index b0960f243..9e467d2b0 100644
--- a/modules/voxelman/library/voxel_library_merger.h
+++ b/modules/voxelman/library/voxel_library_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/map.h"
+#include "core/containers/map.h"
 #include "core/resource.h"
 
 #include "voxel_library.h"
diff --git a/modules/voxelman/library/voxel_library_merger_pcm.cpp b/modules/voxelman/library/voxel_library_merger_pcm.cpp
index 3a6b1bc58..6d50b49d1 100644
--- a/modules/voxelman/library/voxel_library_merger_pcm.cpp
+++ b/modules/voxelman/library/voxel_library_merger_pcm.cpp
@@ -42,7 +42,7 @@ SOFTWARE.
 
 #include "../world/default/voxel_chunk_default.h"
 
-#include "core/hashfuncs.h"
+#include "core/containers/hashfuncs.h"
 
 bool VoxelLibraryMergerPCM::_supports_caching() {
 	return true;
diff --git a/modules/voxelman/library/voxel_library_merger_pcm.h b/modules/voxelman/library/voxel_library_merger_pcm.h
index 63b822621..aee6ae2ae 100644
--- a/modules/voxelman/library/voxel_library_merger_pcm.h
+++ b/modules/voxelman/library/voxel_library_merger_pcm.h
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/resource.h"
 
 #include "voxel_library.h"
diff --git a/modules/voxelman/library/voxel_material_cache.h b/modules/voxelman/library/voxel_material_cache.h
index 5ed1c283b..be1859f37 100644
--- a/modules/voxelman/library/voxel_material_cache.h
+++ b/modules/voxelman/library/voxel_material_cache.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
diff --git a/modules/voxelman/library/voxel_material_cache_pcm.h b/modules/voxelman/library/voxel_material_cache_pcm.h
index ee389b569..19457cd1a 100644
--- a/modules/voxelman/library/voxel_material_cache_pcm.h
+++ b/modules/voxelman/library/voxel_material_cache_pcm.h
@@ -26,7 +26,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
diff --git a/modules/voxelman/library/voxel_surface.h b/modules/voxelman/library/voxel_surface.h
index 47d4456ea..ab7e6169d 100644
--- a/modules/voxelman/library/voxel_surface.h
+++ b/modules/voxelman/library/voxel_surface.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/math/rect2.h"
 #include "scene/resources/material.h"
diff --git a/modules/voxelman/meshers/cubic/voxel_cube_points.h b/modules/voxelman/meshers/cubic/voxel_cube_points.h
index d48fd95b8..932d79cfa 100644
--- a/modules/voxelman/meshers/cubic/voxel_cube_points.h
+++ b/modules/voxelman/meshers/cubic/voxel_cube_points.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class VoxelChunk;
 class SubVoxelFacePointsHelper;
diff --git a/modules/voxelman/meshers/voxel_mesher.h b/modules/voxelman/meshers/voxel_mesher.h
index d5f6a76ab..e2df23828 100644
--- a/modules/voxelman/meshers/voxel_mesher.h
+++ b/modules/voxelman/meshers/voxel_mesher.h
@@ -24,11 +24,11 @@ SOFTWARE.
 
 #include "core/math/color.h"
 #include "core/reference.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../defines.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "scene/3d/mesh_instance.h"
 
 #include "core/math/rect2.h"
diff --git a/modules/voxelman/world/block_voxel_structure.h b/modules/voxelman/world/block_voxel_structure.h
index 217b70a74..4af92e2d5 100644
--- a/modules/voxelman/world/block_voxel_structure.h
+++ b/modules/voxelman/world/block_voxel_structure.h
@@ -22,13 +22,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "voxel_structure.h"
 
 #include "../defines.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 #include "voxel_chunk.h"
 
diff --git a/modules/voxelman/world/jobs/voxel_terrain_job.h b/modules/voxelman/world/jobs/voxel_terrain_job.h
index 8e6831cb8..0da64880c 100644
--- a/modules/voxelman/world/jobs/voxel_terrain_job.h
+++ b/modules/voxelman/world/jobs/voxel_terrain_job.h
@@ -28,7 +28,7 @@ SOFTWARE.
 
 #include "voxel_mesher_job_step.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 class VoxelMesher;
 
diff --git a/modules/voxelman/world/voxel_chunk.h b/modules/voxelman/world/voxel_chunk.h
index 5144f5f15..105940713 100644
--- a/modules/voxelman/world/voxel_chunk.h
+++ b/modules/voxelman/world/voxel_chunk.h
@@ -29,7 +29,7 @@ SOFTWARE.
 
 #include "../defines.h"
 
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
diff --git a/modules/voxelman/world/voxel_structure.h b/modules/voxelman/world/voxel_structure.h
index 38d54ed63..f199d04f7 100644
--- a/modules/voxelman/world/voxel_structure.h
+++ b/modules/voxelman/world/voxel_structure.h
@@ -22,13 +22,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/resource.h"
 
 #include "../defines.h"
 
 #include "core/math/aabb.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "voxel_chunk.h"
 
 class VoxelStructure : public Resource {
diff --git a/modules/voxelman/world/voxel_world.h b/modules/voxelman/world/voxel_world.h
index b9f5cf091..399118f3d 100644
--- a/modules/voxelman/world/voxel_world.h
+++ b/modules/voxelman/world/voxel_world.h
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 #include "core/engine.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 
 #include "../defines.h"
 
diff --git a/modules/web/file_cache.h b/modules/web/file_cache.h
index 618764943..f487c99c3 100644
--- a/modules/web/file_cache.h
+++ b/modules/web/file_cache.h
@@ -1,12 +1,12 @@
 #ifndef FILE_CACHE_H
 #define FILE_CACHE_H
 
-#include "core/hash_map.h"
-#include "core/map.h"
+#include "core/containers/hash_map.h"
+#include "core/containers/map.h"
 #include "core/os/os.h"
 #include "core/os/rw_lock.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/reference.h"
 
diff --git a/modules/web/html/bbcode_parser.h b/modules/web/html/bbcode_parser.h
index 04f4b260f..2faad3638 100644
--- a/modules/web/html/bbcode_parser.h
+++ b/modules/web/html/bbcode_parser.h
@@ -2,7 +2,7 @@
 #define BBCODE_PARSER_H
 
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/reference.h"
 
diff --git a/modules/web/html/form_validator.h b/modules/web/html/form_validator.h
index 7f2dafd72..1f1628d01 100644
--- a/modules/web/html/form_validator.h
+++ b/modules/web/html/form_validator.h
@@ -2,7 +2,7 @@
 #define HTTP_FORM_VALIDATOR_H
 
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/resource.h"
 
diff --git a/modules/web/html/html_parser.h b/modules/web/html/html_parser.h
index 628fc71ab..b1b87a5db 100644
--- a/modules/web/html/html_parser.h
+++ b/modules/web/html/html_parser.h
@@ -3,7 +3,7 @@
 
 #include "core/ustring.h"
 #include "core/variant.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/reference.h"
 
diff --git a/modules/web/html/paginator.h b/modules/web/html/paginator.h
index fc147972d..f3161bd94 100644
--- a/modules/web/html/paginator.h
+++ b/modules/web/html/paginator.h
@@ -2,7 +2,7 @@
 #define HTML_PAGINATOR_H
 
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/reference.h"
 
diff --git a/modules/web/http/http_session.h b/modules/web/http/http_session.h
index 3b507d11c..1ffe911df 100644
--- a/modules/web/http/http_session.h
+++ b/modules/web/http/http_session.h
@@ -1,7 +1,7 @@
 #ifndef HTTP_SESSION_H
 #define HTTP_SESSION_H
 
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 
 #include "core/reference.h"
 
diff --git a/modules/web/http/http_session_manager.h b/modules/web/http/http_session_manager.h
index 3a8867c3a..fe96a474e 100644
--- a/modules/web/http/http_session_manager.h
+++ b/modules/web/http/http_session_manager.h
@@ -1,10 +1,10 @@
 #ifndef HTTP_SESSION_MANAGER_H
 #define HTTP_SESSION_MANAGER_H
 
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/os/mutex.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/reference.h"
 #include "scene/main/node.h"
diff --git a/modules/web/http/web_node.h b/modules/web/http/web_node.h
index 43c466147..4462ae508 100644
--- a/modules/web/http/web_node.h
+++ b/modules/web/http/web_node.h
@@ -2,7 +2,7 @@
 #define WEB_NODE_H
 
 #include "../../modules_enabled.gen.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/os/rw_lock.h"
 #include "core/reference.h"
 #include "core/variant.h"
diff --git a/modules/web/http/web_root.h b/modules/web/http/web_root.h
index a9f330b0a..872083e98 100644
--- a/modules/web/http/web_root.h
+++ b/modules/web/http/web_root.h
@@ -1,10 +1,10 @@
 #ifndef WEB_ROOT_H
 #define WEB_ROOT_H
 
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/os/mutex.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "web_node.h"
 
diff --git a/modules/web/http/web_server_request.h b/modules/web/http/web_server_request.h
index a3e37a3fa..a37724569 100644
--- a/modules/web/http/web_server_request.h
+++ b/modules/web/http/web_server_request.h
@@ -3,7 +3,7 @@
 
 #include "core/dictionary.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/object.h"
 #include "core/reference.h"
diff --git a/modules/web/http_server_simple/http_server_simple.h b/modules/web/http_server_simple/http_server_simple.h
index 1cc61c1cf..d16ac19ea 100644
--- a/modules/web/http_server_simple/http_server_simple.h
+++ b/modules/web/http_server_simple/http_server_simple.h
@@ -34,10 +34,10 @@
 #include "core/io/stream_peer_ssl.h"
 #include "core/io/tcp_server.h"
 #include "core/io/zip_io.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/os/rw_lock.h"
 #include "core/os/semaphore.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/project_settings.h"
 
diff --git a/modules/web/http_server_simple/simple_web_server_request.h b/modules/web/http_server_simple/simple_web_server_request.h
index 6fd869f41..93df80cec 100644
--- a/modules/web/http_server_simple/simple_web_server_request.h
+++ b/modules/web/http_server_simple/simple_web_server_request.h
@@ -2,9 +2,9 @@
 #define SIMPLE_WEB_SERVER_REQUEST_H
 
 #include "core/dictionary.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../http/web_server_request.h"
 
diff --git a/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.h b/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.h
index 8e12f860e..5204ea2ea 100644
--- a/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.h
+++ b/modules/web/nodes/folder_serve_nodes/browsable_folder_serve_web_page.h
@@ -2,7 +2,7 @@
 #define BROWSABLE_FOLDER_SERVE_WEB_PAGE_H
 
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "folder_serve_web_page.h"
 
diff --git a/modules/web/nodes/list_page/list_web_page.h b/modules/web/nodes/list_page/list_web_page.h
index 23b1c9d27..96d3da465 100644
--- a/modules/web/nodes/list_page/list_web_page.h
+++ b/modules/web/nodes/list_page/list_web_page.h
@@ -2,7 +2,7 @@
 #define LIST_WEB_PAGE_H
 
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../../http/web_node.h"
 
diff --git a/modules/web/nodes/paged_article/paged_article_web_page.h b/modules/web/nodes/paged_article/paged_article_web_page.h
index f6cc57550..5f47f51a6 100644
--- a/modules/web/nodes/paged_article/paged_article_web_page.h
+++ b/modules/web/nodes/paged_article/paged_article_web_page.h
@@ -3,7 +3,7 @@
 
 #include "core/reference.h"
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../../http/web_node.h"
 
diff --git a/modules/web/nodes/paged_article/paged_articles_web_page.h b/modules/web/nodes/paged_article/paged_articles_web_page.h
index d5aae7356..3d43170e3 100644
--- a/modules/web/nodes/paged_article/paged_articles_web_page.h
+++ b/modules/web/nodes/paged_article/paged_articles_web_page.h
@@ -2,7 +2,7 @@
 #define PAGED_ARTICLES_WEB_PAGE_H
 
 #include "core/ustring.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "../../http/web_node.h"
 
diff --git a/modules/websocket/emws_peer.h b/modules/websocket/emws_peer.h
index 4ff059bc6..663076bd8 100644
--- a/modules/websocket/emws_peer.h
+++ b/modules/websocket/emws_peer.h
@@ -34,7 +34,7 @@
 
 #include "core/error_list.h"
 #include "core/io/packet_peer.h"
-#include "core/ring_buffer.h"
+#include "core/containers/ring_buffer.h"
 #include "emscripten.h"
 #include "packet_buffer.h"
 #include "websocket_peer.h"
diff --git a/modules/websocket/packet_buffer.h b/modules/websocket/packet_buffer.h
index 87995d608..654c17fcc 100644
--- a/modules/websocket/packet_buffer.h
+++ b/modules/websocket/packet_buffer.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/ring_buffer.h"
+#include "core/containers/ring_buffer.h"
 
 template <class T>
 class PacketBuffer {
diff --git a/modules/websocket/websocket_multiplayer_peer.h b/modules/websocket/websocket_multiplayer_peer.h
index 658a0ebac..34476ad66 100644
--- a/modules/websocket/websocket_multiplayer_peer.h
+++ b/modules/websocket/websocket_multiplayer_peer.h
@@ -32,7 +32,7 @@
 
 #include "core/error_list.h"
 #include "core/io/networked_multiplayer_peer.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "websocket_peer.h"
 
 class WebSocketMultiplayerPeer : public NetworkedMultiplayerPeer {
diff --git a/modules/websocket/wsl_peer.h b/modules/websocket/wsl_peer.h
index e63dc313a..04b883084 100644
--- a/modules/websocket/wsl_peer.h
+++ b/modules/websocket/wsl_peer.h
@@ -35,7 +35,7 @@
 #include "core/error_list.h"
 #include "core/io/packet_peer.h"
 #include "core/io/stream_peer_tcp.h"
-#include "core/ring_buffer.h"
+#include "core/containers/ring_buffer.h"
 #include "packet_buffer.h"
 #include "websocket_peer.h"
 #include "wslay/wslay.h"
diff --git a/modules/wfc/array_2d.h b/modules/wfc/array_2d.h
index 40504e1e4..a72dac514 100644
--- a/modules/wfc/array_2d.h
+++ b/modules/wfc/array_2d.h
@@ -1,8 +1,8 @@
 #ifndef FAST_WFC_UTILS_ARRAY2D_HPP_
 #define FAST_WFC_UTILS_ARRAY2D_HPP_
 
-#include "core/vector.h"
-#include "core/pool_vector.h"
+#include "core/containers/vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/variant.h"
 
 template <typename T>
diff --git a/modules/wfc/array_3d.h b/modules/wfc/array_3d.h
index 6ec177d71..db543aa56 100644
--- a/modules/wfc/array_3d.h
+++ b/modules/wfc/array_3d.h
@@ -1,7 +1,7 @@
 #ifndef FAST_WFC_UTILS_ARRAY3D_HPP_
 #define FAST_WFC_UTILS_ARRAY3D_HPP_
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 template <typename T>
 class Array3D {
diff --git a/modules/wfc/image_indexer.h b/modules/wfc/image_indexer.h
index b4c75552b..461281b75 100644
--- a/modules/wfc/image_indexer.h
+++ b/modules/wfc/image_indexer.h
@@ -4,7 +4,7 @@
 #include "core/image.h"
 #include "core/reference.h"
 #include "core/variant.h"
-#include "core/oa_hash_map.h"
+#include "core/containers/oa_hash_map.h"
 
 class ImageIndexer : public Reference {
 	GDCLASS(ImageIndexer, Reference);
diff --git a/modules/wfc/overlapping_wave_form_collapse.cpp b/modules/wfc/overlapping_wave_form_collapse.cpp
index 580403a04..4d865f3f6 100644
--- a/modules/wfc/overlapping_wave_form_collapse.cpp
+++ b/modules/wfc/overlapping_wave_form_collapse.cpp
@@ -1,7 +1,7 @@
 
 #include "overlapping_wave_form_collapse.h"
 
-#include "core/set.h"
+#include "core/containers/set.h"
 
 bool OverlappingWaveFormCollapse::get_periodic_input() const {
 	return _periodic_input;
diff --git a/modules/wfc/overlapping_wave_form_collapse.h b/modules/wfc/overlapping_wave_form_collapse.h
index ca558f5f3..1a2dd83c0 100644
--- a/modules/wfc/overlapping_wave_form_collapse.h
+++ b/modules/wfc/overlapping_wave_form_collapse.h
@@ -1,7 +1,7 @@
 #ifndef OVERLAPPING_WAVE_FORM_COLLAPSE_H
 #define OVERLAPPING_WAVE_FORM_COLLAPSE_H
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "array_2d.h"
 #include "wave_form_collapse.h"
diff --git a/modules/wfc/tiling_wave_form_collapse.h b/modules/wfc/tiling_wave_form_collapse.h
index 4398bb228..f5e7e9151 100644
--- a/modules/wfc/tiling_wave_form_collapse.h
+++ b/modules/wfc/tiling_wave_form_collapse.h
@@ -2,7 +2,7 @@
 #define TILING_WAVE_FORM_COLLAPSE_H
 
 #include "array_2d.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "wave_form_collapse.h"
 
diff --git a/modules/wfc/wave_form_collapse.h b/modules/wfc/wave_form_collapse.h
index edb67b1a6..b144c5af3 100644
--- a/modules/wfc/wave_form_collapse.h
+++ b/modules/wfc/wave_form_collapse.h
@@ -6,7 +6,7 @@
 
 #include "array_2d.h"
 #include "array_3d.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 #include "core/reference.h"
 
diff --git a/platform/android/java_pandemonium_wrapper.h b/platform/android/java_pandemonium_wrapper.h
index 5df78dbcf..c618fde21 100644
--- a/platform/android/java_pandemonium_wrapper.h
+++ b/platform/android/java_pandemonium_wrapper.h
@@ -36,7 +36,7 @@
 #include <android/log.h>
 #include <jni.h>
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "string_android.h"
 
 // Class that makes functions in java/src/org/pandemoniumengine/pandemonium/Pandemonium.java callable from C++
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h
index 1ee1cf3c4..0747e8ea3 100644
--- a/platform/x11/os_x11.h
+++ b/platform/x11/os_x11.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "context_gl_x11.h"
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/os/input.h"
 #include "crash_handler_x11.h"
 #include "drivers/alsa/audio_driver_alsa.h"
diff --git a/scene/2d/area_2d.h b/scene/2d/area_2d.h
index cbe848f6e..959a6b55b 100644
--- a/scene/2d/area_2d.h
+++ b/scene/2d/area_2d.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/vset.h"
+#include "core/containers/vset.h"
 #include "scene/2d/collision_object_2d.h"
 
 class Area2D : public CollisionObject2D {
diff --git a/scene/2d/navigation_agent_2d.cpp b/scene/2d/navigation_agent_2d.cpp
index 1b8356994..0e76e018f 100644
--- a/scene/2d/navigation_agent_2d.cpp
+++ b/scene/2d/navigation_agent_2d.cpp
@@ -31,7 +31,7 @@
 #include "navigation_agent_2d.h"
 
 #include "core/engine.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/2d/navigation_2d.h"
 #include "scene/resources/world_2d.h"
 #include "servers/navigation_2d_server.h"
diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp
index 9e43a54b9..97e34588c 100644
--- a/scene/2d/physics_body_2d.cpp
+++ b/scene/2d/physics_body_2d.cpp
@@ -32,7 +32,7 @@
 
 #include "core/core_string_names.h"
 #include "core/engine.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/math_funcs.h"
 #include "core/method_bind_ext.gen.inc"
 #include "core/object.h"
diff --git a/scene/2d/physics_body_2d.h b/scene/2d/physics_body_2d.h
index 77ddd1436..6a6cbd34d 100644
--- a/scene/2d/physics_body_2d.h
+++ b/scene/2d/physics_body_2d.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/vset.h"
+#include "core/containers/vset.h"
 #include "scene/2d/collision_object_2d.h"
 #include "servers/physics_2d_server.h"
 
diff --git a/scene/3d/area.h b/scene/3d/area.h
index 7041318db..7e2b00218 100644
--- a/scene/3d/area.h
+++ b/scene/3d/area.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/vset.h"
+#include "core/containers/vset.h"
 #include "scene/3d/collision_object.h"
 
 class Area : public CollisionObject {
diff --git a/scene/3d/mesh_instance.h b/scene/3d/mesh_instance.h
index f5d9a87c2..8bf6abb6c 100644
--- a/scene/3d/mesh_instance.h
+++ b/scene/3d/mesh_instance.h
@@ -32,7 +32,7 @@
 
 #include "scene/3d/visual_instance.h"
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/reference.h"
 
 class Mesh;
diff --git a/scene/3d/navigation_agent.h b/scene/3d/navigation_agent.h
index baedb3772..ec8b5e417 100644
--- a/scene/3d/navigation_agent.h
+++ b/scene/3d/navigation_agent.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/main/node.h"
 
 class Spatial;
diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp
index 95cb594fa..ae212fd6b 100644
--- a/scene/3d/physics_body.cpp
+++ b/scene/3d/physics_body.cpp
@@ -32,7 +32,7 @@
 
 #include "core/core_string_names.h"
 #include "core/engine.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/method_bind_ext.gen.inc"
 #include "core/object.h"
 #include "core/project_settings.h"
diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h
index f05fa2ee0..5bc0a7a6e 100644
--- a/scene/3d/physics_body.h
+++ b/scene/3d/physics_body.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/reference.h"
-#include "core/vset.h"
+#include "core/containers/vset.h"
 #include "scene/3d/collision_object.h"
 #include "servers/physics_server.h"
 
diff --git a/scene/3d/portal.h b/scene/3d/portal.h
index 83ff9910b..51e41e935 100644
--- a/scene/3d/portal.h
+++ b/scene/3d/portal.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/rid.h"
 #include "spatial.h"
 
diff --git a/scene/3d/room.h b/scene/3d/room.h
index c6e5b9f15..4b733f8fa 100644
--- a/scene/3d/room.h
+++ b/scene/3d/room.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/math/geometry.h"
 #include "core/rid.h"
 #include "spatial.h"
diff --git a/scene/3d/room_manager.h b/scene/3d/room_manager.h
index 1230a0e86..22b61e5aa 100644
--- a/scene/3d/room_manager.h
+++ b/scene/3d/room_manager.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "room.h"
 #include "spatial.h"
 
diff --git a/scene/3d/soft_body.cpp b/scene/3d/soft_body.cpp
index d8162a4f4..85eedee11 100644
--- a/scene/3d/soft_body.cpp
+++ b/scene/3d/soft_body.cpp
@@ -29,7 +29,7 @@
 /*************************************************************************/
 
 #include "soft_body.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/object.h"
 #include "core/os/os.h"
 #include "core/rid.h"
diff --git a/scene/debugger/script_debugger_remote.h b/scene/debugger/script_debugger_remote.h
index 07ec95e51..09e2fe11a 100644
--- a/scene/debugger/script_debugger_remote.h
+++ b/scene/debugger/script_debugger_remote.h
@@ -32,7 +32,7 @@
 
 #include "core/io/packet_peer.h"
 #include "core/io/stream_peer_tcp.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/os/os.h"
 #include "core/script_language.h"
 
diff --git a/scene/main/node.h b/scene/main/node.h
index c3cca9e33..f82e604d7 100644
--- a/scene/main/node.h
+++ b/scene/main/node.h
@@ -32,7 +32,7 @@
 
 #include "core/object.h"
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/node_path.h"
 #include "scene/main/scene_tree.h"
 
diff --git a/scene/main/scene_tree.h b/scene/main/scene_tree.h
index 0c58814f7..b9fdada8d 100644
--- a/scene/main/scene_tree.h
+++ b/scene/main/scene_tree.h
@@ -33,7 +33,7 @@
 #include "core/io/multiplayer_api.h"
 #include "core/os/main_loop.h"
 #include "core/os/thread_safe.h"
-#include "core/self_list.h"
+#include "core/containers/self_list.h"
 
 class PackedScene;
 class Node;
diff --git a/scene/property_utils.cpp b/scene/property_utils.cpp
index e3717ee7d..0d366a697 100644
--- a/scene/property_utils.cpp
+++ b/scene/property_utils.cpp
@@ -32,7 +32,7 @@
 
 #include "core/core_string_names.h"
 #include "core/engine.h"
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "editor/editor_node.h"
 #include "scene/resources/packed_scene.h"
 
diff --git a/scene/resources/font.h b/scene/resources/font.h
index 052b07b9b..89905b477 100644
--- a/scene/resources/font.h
+++ b/scene/resources/font.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/io/resource_loader.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "core/resource.h"
 
 class Texture;
diff --git a/scene/resources/immediate_mesh.h b/scene/resources/immediate_mesh.h
index 9f4ff7e2a..53fac85dc 100644
--- a/scene/resources/immediate_mesh.h
+++ b/scene/resources/immediate_mesh.h
@@ -31,7 +31,7 @@
 #ifndef IMMEDIATE_MESH_H
 #define IMMEDIATE_MESH_H
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/resources/mesh.h"
 
 class ImmediateMesh : public Mesh {
diff --git a/scene/resources/importer_mesh.h b/scene/resources/importer_mesh.h
index 4bed9f228..834df048e 100644
--- a/scene/resources/importer_mesh.h
+++ b/scene/resources/importer_mesh.h
@@ -32,7 +32,7 @@
 #define IMPORTER_MESH_H
 
 #include "core/resource.h"
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "scene/resources/concave_polygon_shape.h"
 #include "scene/resources/convex_polygon_shape.h"
 #include "scene/resources/mesh.h"
diff --git a/scene/resources/material.h b/scene/resources/material.h
index 3e102f6e1..72a074ac1 100644
--- a/scene/resources/material.h
+++ b/scene/resources/material.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/resource.h"
-#include "core/self_list.h"
+#include "core/containers/self_list.h"
 #include "scene/resources/shader.h"
 #include "servers/visual_server.h"
 
diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp
index e5b2bd22c..866467bda 100644
--- a/scene/resources/mesh.cpp
+++ b/scene/resources/mesh.cpp
@@ -31,7 +31,7 @@
 #include "mesh.h"
 
 #include "core/crypto/crypto_core.h"
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/math/convex_hull.h"
 #include "core/pair.h"
 #include "scene/resources/concave_polygon_shape.h"
diff --git a/scene/resources/occluder_shape.h b/scene/resources/occluder_shape.h
index 959a02cee..b443cf40e 100644
--- a/scene/resources/occluder_shape.h
+++ b/scene/resources/occluder_shape.h
@@ -32,7 +32,7 @@
 
 #include "core/math/plane.h"
 #include "core/resource.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 class OccluderShape : public Resource {
 	GDCLASS(OccluderShape, Resource);
diff --git a/scene/resources/skeleton_modification_stack_3d.h b/scene/resources/skeleton_modification_stack_3d.h
index bdc1b0a46..d778b0802 100644
--- a/scene/resources/skeleton_modification_stack_3d.h
+++ b/scene/resources/skeleton_modification_stack_3d.h
@@ -31,7 +31,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/vector.h"
+#include "core/containers/vector.h"
 #include "scene/3d/skeleton.h"
 
 class Skeleton;
diff --git a/servers/audio/effects/audio_effect_capture.h b/servers/audio/effects/audio_effect_capture.h
index 15ae2b8ed..4ffb36a39 100644
--- a/servers/audio/effects/audio_effect_capture.h
+++ b/servers/audio/effects/audio_effect_capture.h
@@ -32,9 +32,9 @@
 
 #include "core/engine.h"
 #include "core/math/audio_frame.h"
-#include "core/pool_vector.h"
+#include "core/containers/pool_vector.h"
 #include "core/reference.h"
-#include "core/ring_buffer.h"
+#include "core/containers/ring_buffer.h"
 #include "servers/audio/audio_effect.h"
 #include "servers/audio_server.h"
 
diff --git a/servers/audio/effects/audio_stream_generator.h b/servers/audio/effects/audio_stream_generator.h
index 64b32688d..c0e4dc21d 100644
--- a/servers/audio/effects/audio_stream_generator.h
+++ b/servers/audio/effects/audio_stream_generator.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/ring_buffer.h"
+#include "core/containers/ring_buffer.h"
 #include "servers/audio/audio_stream.h"
 
 class AudioStreamGenerator : public AudioStream {
diff --git a/servers/audio/effects/eq.h b/servers/audio/effects/eq.h
index a47a41708..ed87026aa 100644
--- a/servers/audio/effects/eq.h
+++ b/servers/audio/effects/eq.h
@@ -33,7 +33,7 @@
 // Author: reduzio@gmail.com (C) 2006
 
 #include "core/typedefs.h"
-#include "core/vector.h"
+#include "core/containers/vector.h"
 
 /**
 @author Juan Linietsky
diff --git a/servers/physics/area_sw.h b/servers/physics/area_sw.h
index f0e51f274..82e8b3f2a 100644
--- a/servers/physics/area_sw.h
+++ b/servers/physics/area_sw.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "collision_object_sw.h"
-#include "core/self_list.h"
+#include "core/containers/self_list.h"
 #include "servers/physics_server.h"
 //#include "servers/physics/query_sw.h"
 
diff --git a/servers/physics/body_sw.h b/servers/physics/body_sw.h
index 5c33a9429..9a31fd522 100644
--- a/servers/physics/body_sw.h
+++ b/servers/physics/body_sw.h
@@ -32,7 +32,7 @@
 
 #include "area_sw.h"
 #include "collision_object_sw.h"
-#include "core/vset.h"
+#include "core/containers/vset.h"
 
 class ConstraintSW;
 class PhysicsDirectBodyStateSW;
diff --git a/servers/physics/broad_phase_basic.cpp b/servers/physics/broad_phase_basic.cpp
index 6288be47d..98da33d30 100644
--- a/servers/physics/broad_phase_basic.cpp
+++ b/servers/physics/broad_phase_basic.cpp
@@ -29,7 +29,7 @@
 /*************************************************************************/
 
 #include "broad_phase_basic.h"
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/print_string.h"
 
 BroadPhaseSW::ID BroadPhaseBasic::create(CollisionObjectSW *p_object, int p_subindex, const AABB &p_aabb, bool p_static) {
diff --git a/servers/physics/broad_phase_basic.h b/servers/physics/broad_phase_basic.h
index 22f7c6f5b..f7f74fb84 100644
--- a/servers/physics/broad_phase_basic.h
+++ b/servers/physics/broad_phase_basic.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "broad_phase_sw.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 
 class BroadPhaseBasic : public BroadPhaseSW {
 	struct Element {
diff --git a/servers/physics/collision_object_sw.h b/servers/physics/collision_object_sw.h
index 0a7311b22..90244af64 100644
--- a/servers/physics/collision_object_sw.h
+++ b/servers/physics/collision_object_sw.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "broad_phase_sw.h"
-#include "core/self_list.h"
+#include "core/containers/self_list.h"
 #include "servers/physics_server.h"
 #include "shape_sw.h"
 
diff --git a/servers/physics/shape_sw.cpp b/servers/physics/shape_sw.cpp
index 95d00a3cd..032d28296 100644
--- a/servers/physics/shape_sw.cpp
+++ b/servers/physics/shape_sw.cpp
@@ -33,7 +33,7 @@
 #include "core/image.h"
 #include "core/math/convex_hull.h"
 #include "core/math/geometry.h"
-#include "core/sort_array.h"
+#include "core/containers/sort_array.h"
 
 // HeightMapShapeSW is based on Bullet btHeightfieldTerrainShape.
 
diff --git a/servers/physics/shape_sw.h b/servers/physics/shape_sw.h
index c48f65a43..d271961c8 100644
--- a/servers/physics/shape_sw.h
+++ b/servers/physics/shape_sw.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/math/bsp_tree.h"
 #include "core/math/geometry.h"
 #include "servers/physics_server.h"
diff --git a/servers/physics/space_sw.h b/servers/physics/space_sw.h
index 1b2aaba4d..0ba72ba9e 100644
--- a/servers/physics/space_sw.h
+++ b/servers/physics/space_sw.h
@@ -36,7 +36,7 @@
 #include "body_sw.h"
 #include "broad_phase_sw.h"
 #include "collision_object_sw.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/project_settings.h"
 #include "core/typedefs.h"
 
diff --git a/servers/physics_2d/area_2d_sw.h b/servers/physics_2d/area_2d_sw.h
index 0221ef898..db99aab17 100644
--- a/servers/physics_2d/area_2d_sw.h
+++ b/servers/physics_2d/area_2d_sw.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "collision_object_2d_sw.h"
-#include "core/self_list.h"
+#include "core/containers/self_list.h"
 #include "servers/physics_2d_server.h"
 //#include "servers/physics/query_sw.h"
 
diff --git a/servers/physics_2d/body_2d_sw.h b/servers/physics_2d/body_2d_sw.h
index 3114bc9fd..d6ebe52f1 100644
--- a/servers/physics_2d/body_2d_sw.h
+++ b/servers/physics_2d/body_2d_sw.h
@@ -32,7 +32,7 @@
 
 #include "area_2d_sw.h"
 #include "collision_object_2d_sw.h"
-#include "core/vset.h"
+#include "core/containers/vset.h"
 
 class Constraint2DSW;
 class Physics2DDirectBodyStateSW;
diff --git a/servers/physics_2d/broad_phase_2d_basic.h b/servers/physics_2d/broad_phase_2d_basic.h
index 492811389..9bd776d1c 100644
--- a/servers/physics_2d/broad_phase_2d_basic.h
+++ b/servers/physics_2d/broad_phase_2d_basic.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/map.h"
+#include "core/containers/map.h"
 #include "space_2d_sw.h"
 class BroadPhase2DBasic : public BroadPhase2DSW {
 	struct Element {
diff --git a/servers/physics_2d/broad_phase_2d_hash_grid.h b/servers/physics_2d/broad_phase_2d_hash_grid.h
index 7f12f20c0..62d8d2358 100644
--- a/servers/physics_2d/broad_phase_2d_hash_grid.h
+++ b/servers/physics_2d/broad_phase_2d_hash_grid.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "broad_phase_2d_sw.h"
-#include "core/map.h"
+#include "core/containers/map.h"
 
 class BroadPhase2DHashGrid : public BroadPhase2DSW {
 	struct PairData {
diff --git a/servers/physics_2d/collision_object_2d_sw.h b/servers/physics_2d/collision_object_2d_sw.h
index eda4507e2..88c7e6cbe 100644
--- a/servers/physics_2d/collision_object_2d_sw.h
+++ b/servers/physics_2d/collision_object_2d_sw.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "broad_phase_2d_sw.h"
-#include "core/self_list.h"
+#include "core/containers/self_list.h"
 #include "servers/physics_2d_server.h"
 #include "shape_2d_sw.h"
 
diff --git a/servers/physics_2d/shape_2d_sw.cpp b/servers/physics_2d/shape_2d_sw.cpp
index 524fb155f..bb9893347 100644
--- a/servers/physics_2d/shape_2d_sw.cpp
+++ b/servers/physics_2d/shape_2d_sw.cpp
@@ -31,7 +31,7 @@
 #include "shape_2d_sw.h"
 
 #include "core/math/geometry.h"
-#include "core/sort_array.h"
+#include "core/containers/sort_array.h"
 
 void Shape2DSW::configure(const Rect2 &p_aabb) {
 	aabb = p_aabb;
diff --git a/servers/physics_2d/space_2d_sw.h b/servers/physics_2d/space_2d_sw.h
index 0b83cd921..974cf293f 100644
--- a/servers/physics_2d/space_2d_sw.h
+++ b/servers/physics_2d/space_2d_sw.h
@@ -36,7 +36,7 @@
 #include "body_pair_2d_sw.h"
 #include "broad_phase_2d_sw.h"
 #include "collision_object_2d_sw.h"
-#include "core/hash_map.h"
+#include "core/containers/hash_map.h"
 #include "core/project_settings.h"
 #include "core/typedefs.h"
 
diff --git a/servers/visual/portals/portal_gameplay_monitor.h b/servers/visual/portals/portal_gameplay_monitor.h
index d54b40cb4..f2186a9e7 100644
--- a/servers/visual/portals/portal_gameplay_monitor.h
+++ b/servers/visual/portals/portal_gameplay_monitor.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "servers/visual_server_callbacks.h"
 
 #include <stdint.h>
diff --git a/servers/visual/portals/portal_pvs.h b/servers/visual/portals/portal_pvs.h
index f13a3c59d..988dbd682 100644
--- a/servers/visual/portals/portal_pvs.h
+++ b/servers/visual/portals/portal_pvs.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 
 class PVS {
 public:
diff --git a/servers/visual/portals/portal_pvs_builder.h b/servers/visual/portals/portal_pvs_builder.h
index 3a37a0cf9..d5eab6a44 100644
--- a/servers/visual/portals/portal_pvs_builder.h
+++ b/servers/visual/portals/portal_pvs_builder.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/bitfield_dynamic.h"
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/math/plane.h"
 
 //#define PANDEMONIUM_PVS_SUPPORT_SAVE_FILE
diff --git a/servers/visual/portals/portal_renderer.h b/servers/visual/portals/portal_renderer.h
index 5f7af7972..e195e85b8 100644
--- a/servers/visual/portals/portal_renderer.h
+++ b/servers/visual/portals/portal_renderer.h
@@ -33,8 +33,8 @@
 #include "core/math/projection.h"
 #include "core/math/geometry.h"
 #include "core/math/plane.h"
-#include "core/pooled_list.h"
-#include "core/vector.h"
+#include "core/containers/pooled_list.h"
+#include "core/containers/vector.h"
 #include "portal_gameplay_monitor.h"
 #include "portal_pvs.h"
 #include "portal_resources.h"
diff --git a/servers/visual/portals/portal_rooms_bsp.h b/servers/visual/portals/portal_rooms_bsp.h
index 70634b2d2..aa958dd7c 100644
--- a/servers/visual/portals/portal_rooms_bsp.h
+++ b/servers/visual/portals/portal_rooms_bsp.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/math/aabb.h"
 #include "core/math/plane.h"
 
diff --git a/servers/visual/portals/portal_tracer.h b/servers/visual/portals/portal_tracer.h
index 620f4861c..79277c022 100644
--- a/servers/visual/portals/portal_tracer.h
+++ b/servers/visual/portals/portal_tracer.h
@@ -31,7 +31,7 @@
 /*************************************************************************/
 
 #include "core/bitfield_dynamic.h"
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "portal_occlusion_culler.h"
 #include "portal_types.h"
 
diff --git a/servers/visual/portals/portal_types.h b/servers/visual/portals/portal_types.h
index 83fb70fee..d342f2f00 100644
--- a/servers/visual/portals/portal_types.h
+++ b/servers/visual/portals/portal_types.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/math/aabb.h"
 #include "core/math/plane.h"
 #include "core/math/quaternion.h"
diff --git a/servers/visual/rasterizer.h b/servers/visual/rasterizer.h
index 3239a8b83..712e43d00 100644
--- a/servers/visual/rasterizer.h
+++ b/servers/visual/rasterizer.h
@@ -34,7 +34,7 @@
 #include "core/math/transform_interpolator.h"
 #include "servers/visual_server.h"
 
-#include "core/self_list.h"
+#include "core/containers/self_list.h"
 
 class RasterizerScene {
 public:
diff --git a/servers/visual/shader_language.h b/servers/visual/shader_language.h
index 34bc29d6f..fde47146f 100644
--- a/servers/visual/shader_language.h
+++ b/servers/visual/shader_language.h
@@ -30,9 +30,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/list.h"
-#include "core/map.h"
-#include "core/ordered_hash_map.h"
+#include "core/containers/list.h"
+#include "core/containers/map.h"
+#include "core/containers/ordered_hash_map.h"
 #include "core/script_language.h"
 #include "core/string_name.h"
 #include "core/typedefs.h"
diff --git a/servers/visual/shader_types.h b/servers/visual/shader_types.h
index 57127ec73..9226f7997 100644
--- a/servers/visual/shader_types.h
+++ b/servers/visual/shader_types.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/ordered_hash_map.h"
+#include "core/containers/ordered_hash_map.h"
 #include "servers/visual_server.h"
 #include "shader_language.h"
 
diff --git a/servers/visual/visual_server_raster.cpp b/servers/visual/visual_server_raster.cpp
index 9cdb32de4..8da3b53bc 100644
--- a/servers/visual/visual_server_raster.cpp
+++ b/servers/visual/visual_server_raster.cpp
@@ -33,7 +33,7 @@
 #include "core/io/marshalls.h"
 #include "core/os/os.h"
 #include "core/project_settings.h"
-#include "core/sort_array.h"
+#include "core/containers/sort_array.h"
 #include "visual_server_canvas.h"
 #include "visual_server_globals.h"
 #include "visual_server_scene.h"
diff --git a/servers/visual/visual_server_scene.h b/servers/visual/visual_server_scene.h
index d981c1f50..272a3cbc1 100644
--- a/servers/visual/visual_server_scene.h
+++ b/servers/visual/visual_server_scene.h
@@ -38,7 +38,7 @@
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
 #include "core/safe_refcount.h"
-#include "core/self_list.h"
+#include "core/containers/self_list.h"
 #include "portals/portal_renderer.h"
 
 class VisualServerScene {
diff --git a/servers/visual/visual_server_viewport.h b/servers/visual/visual_server_viewport.h
index f747f64f4..21ca3b651 100644
--- a/servers/visual/visual_server_viewport.h
+++ b/servers/visual/visual_server_viewport.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/self_list.h"
+#include "core/containers/self_list.h"
 #include "rasterizer.h"
 #include "servers/visual_server.h"
 
diff --git a/servers/visual_server_callbacks.h b/servers/visual_server_callbacks.h
index d90b9fe6f..697080896 100644
--- a/servers/visual_server_callbacks.h
+++ b/servers/visual_server_callbacks.h
@@ -30,7 +30,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "core/local_vector.h"
+#include "core/containers/local_vector.h"
 #include "core/object_id.h"
 #include "core/os/mutex.h"
 
diff --git a/thirdparty/misc/triangulator.h b/thirdparty/misc/triangulator.h
index 95d2a6dc2..f5ca539ef 100644
--- a/thirdparty/misc/triangulator.h
+++ b/thirdparty/misc/triangulator.h
@@ -23,9 +23,9 @@
 
 
 
-#include "core/list.h"
+#include "core/containers/list.h"
 #include "core/math/vector2.h"
-#include "core/set.h"
+#include "core/containers/set.h"
 
 //2D point structure