From bde4031172d4122ec356a5bd6d0af9b3088813ef Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 18 Dec 2023 21:48:20 +0100 Subject: [PATCH] More reorganization. --- sfw/{image/stb_image.h => application/3rd_stb_image.h} | 0 sfw/{image => application}/image.cpp | 0 sfw/{image => application}/image.h | 0 sfw/{ => application}/input/SCsub | 0 sfw/{ => application}/input/default_controller_mappings.gen.cpp | 0 sfw/{ => application}/input/default_controller_mappings.h | 0 sfw/{ => application}/input/gamecontrollerdb.txt | 0 sfw/{ => application}/input/input.cpp | 0 sfw/{ => application}/input/input.h | 0 sfw/{ => application}/input/input_builders.py | 0 sfw/{ => application}/input/input_event.cpp | 0 sfw/{ => application}/input/input_event.h | 0 sfw/{ => application}/input/input_map.cpp | 0 sfw/{ => application}/input/input_map.h | 0 sfw/{ => application}/input/pandemoniumcontrollerdb.txt | 0 sfw/{ => application}/input/shortcut.cpp | 0 sfw/{ => application}/input/shortcut.h | 0 sfw/{ => application}/object.cpp | 0 sfw/{ => application}/object.h | 0 sfw/{ => application}/reference.cpp | 0 sfw/{ => application}/reference.h | 0 sfw/{ => application}/signal.cpp | 0 sfw/{ => application}/signal.h | 0 sfw/{ => application}/variant.cpp | 0 sfw/{ => application}/variant.h | 0 sfw/{os/tinydir.h => core/3rd_tinydir.h} | 0 sfw/{string => core}/char_range.inc | 0 sfw/{string => core}/char_utils.h | 0 sfw/{ => core}/containers/cowdata.h | 0 sfw/{ => core}/containers/hash_map.h | 0 sfw/{ => core}/containers/hash_set.h | 0 sfw/{ => core}/containers/hashfuncs.h | 0 sfw/{ => core}/containers/list.h | 0 sfw/{ => core}/containers/local_vector.h | 0 sfw/{ => core}/containers/paged_allocator.h | 0 sfw/{ => core}/containers/pair.h | 0 sfw/{ => core}/containers/queue.h | 0 sfw/{ => core}/containers/rb_map.h | 0 sfw/{ => core}/containers/rb_set.h | 0 sfw/{ => core}/containers/ring_buffer.h | 0 sfw/{ => core}/containers/rvector.h | 0 sfw/{ => core}/containers/tight_local_vector.h | 0 sfw/{ => core}/containers/vector.h | 0 sfw/{ => core}/containers/vmap.h | 0 sfw/{ => core}/containers/vset.h | 0 sfw/{os => core}/directory.cpp | 0 sfw/{os => core}/directory.h | 2 +- sfw/{ => core}/error_list.h | 0 sfw/{ => core}/error_macros.h | 0 sfw/{ => core}/int_types.h | 0 sfw/{log => core}/logger.cpp | 0 sfw/{log => core}/logger.h | 0 sfw/{ => core}/math/aabb.cpp | 0 sfw/{ => core}/math/aabb.h | 0 sfw/{ => core}/math/basis.cpp | 0 sfw/{ => core}/math/basis.h | 0 sfw/{ => core}/math/color.cpp | 0 sfw/{ => core}/math/color.h | 0 sfw/{ => core}/math/color_names.inc | 0 sfw/{ => core}/math/face3.cpp | 0 sfw/{ => core}/math/face3.h | 0 sfw/{ => core}/math/geometry.cpp | 0 sfw/{ => core}/math/geometry.h | 0 sfw/{ => core}/math/math_defs.h | 0 sfw/{ => core}/math/pcg.cpp | 0 sfw/{ => core}/math/pcg.h | 0 sfw/{ => core}/math/plane.cpp | 0 sfw/{ => core}/math/plane.h | 0 sfw/{ => core}/math/projection.cpp | 0 sfw/{ => core}/math/projection.h | 0 sfw/{ => core}/math/quaternion.cpp | 0 sfw/{ => core}/math/quaternion.h | 0 sfw/{ => core}/math/random_number_generator.cpp | 0 sfw/{ => core}/math/random_number_generator.h | 0 sfw/{ => core}/math/random_pcg.cpp | 0 sfw/{ => core}/math/random_pcg.h | 0 sfw/{ => core}/math/rect2.cpp | 0 sfw/{ => core}/math/rect2.h | 0 sfw/{ => core}/math/rect2i.cpp | 0 sfw/{ => core}/math/rect2i.h | 0 sfw/{ => core}/math/transform.cpp | 0 sfw/{ => core}/math/transform.h | 0 sfw/{ => core}/math/transform_2d.cpp | 0 sfw/{ => core}/math/transform_2d.h | 0 sfw/{ => core}/math/vector2.cpp | 0 sfw/{ => core}/math/vector2.h | 0 sfw/{ => core}/math/vector2i.cpp | 0 sfw/{ => core}/math/vector2i.h | 0 sfw/{ => core}/math/vector3.cpp | 0 sfw/{ => core}/math/vector3.h | 0 sfw/{ => core}/math/vector3i.cpp | 0 sfw/{ => core}/math/vector3i.h | 0 sfw/{ => core}/math/vector4.cpp | 0 sfw/{ => core}/math/vector4.h | 0 sfw/{ => core}/math/vector4i.cpp | 0 sfw/{ => core}/math/vector4i.h | 0 sfw/{ => core}/memory.h | 0 sfw/{ => core/old}/string.cpp | 0 sfw/{ => core/old}/string.h | 0 sfw/{ => core}/typedefs.h | 0 sfw/{string => core}/ucaps.h | 0 sfw/{string => core}/ustring.cpp | 0 sfw/{string => core}/ustring.h | 0 103 files changed, 1 insertion(+), 1 deletion(-) rename sfw/{image/stb_image.h => application/3rd_stb_image.h} (100%) rename sfw/{image => application}/image.cpp (100%) rename sfw/{image => application}/image.h (100%) rename sfw/{ => application}/input/SCsub (100%) rename sfw/{ => application}/input/default_controller_mappings.gen.cpp (100%) rename sfw/{ => application}/input/default_controller_mappings.h (100%) rename sfw/{ => application}/input/gamecontrollerdb.txt (100%) rename sfw/{ => application}/input/input.cpp (100%) rename sfw/{ => application}/input/input.h (100%) rename sfw/{ => application}/input/input_builders.py (100%) rename sfw/{ => application}/input/input_event.cpp (100%) rename sfw/{ => application}/input/input_event.h (100%) rename sfw/{ => application}/input/input_map.cpp (100%) rename sfw/{ => application}/input/input_map.h (100%) rename sfw/{ => application}/input/pandemoniumcontrollerdb.txt (100%) rename sfw/{ => application}/input/shortcut.cpp (100%) rename sfw/{ => application}/input/shortcut.h (100%) rename sfw/{ => application}/object.cpp (100%) rename sfw/{ => application}/object.h (100%) rename sfw/{ => application}/reference.cpp (100%) rename sfw/{ => application}/reference.h (100%) rename sfw/{ => application}/signal.cpp (100%) rename sfw/{ => application}/signal.h (100%) rename sfw/{ => application}/variant.cpp (100%) rename sfw/{ => application}/variant.h (100%) rename sfw/{os/tinydir.h => core/3rd_tinydir.h} (100%) rename sfw/{string => core}/char_range.inc (100%) rename sfw/{string => core}/char_utils.h (100%) rename sfw/{ => core}/containers/cowdata.h (100%) rename sfw/{ => core}/containers/hash_map.h (100%) rename sfw/{ => core}/containers/hash_set.h (100%) rename sfw/{ => core}/containers/hashfuncs.h (100%) rename sfw/{ => core}/containers/list.h (100%) rename sfw/{ => core}/containers/local_vector.h (100%) rename sfw/{ => core}/containers/paged_allocator.h (100%) rename sfw/{ => core}/containers/pair.h (100%) rename sfw/{ => core}/containers/queue.h (100%) rename sfw/{ => core}/containers/rb_map.h (100%) rename sfw/{ => core}/containers/rb_set.h (100%) rename sfw/{ => core}/containers/ring_buffer.h (100%) rename sfw/{ => core}/containers/rvector.h (100%) rename sfw/{ => core}/containers/tight_local_vector.h (100%) rename sfw/{ => core}/containers/vector.h (100%) rename sfw/{ => core}/containers/vmap.h (100%) rename sfw/{ => core}/containers/vset.h (100%) rename sfw/{os => core}/directory.cpp (100%) rename sfw/{os => core}/directory.h (97%) rename sfw/{ => core}/error_list.h (100%) rename sfw/{ => core}/error_macros.h (100%) rename sfw/{ => core}/int_types.h (100%) rename sfw/{log => core}/logger.cpp (100%) rename sfw/{log => core}/logger.h (100%) rename sfw/{ => core}/math/aabb.cpp (100%) rename sfw/{ => core}/math/aabb.h (100%) rename sfw/{ => core}/math/basis.cpp (100%) rename sfw/{ => core}/math/basis.h (100%) rename sfw/{ => core}/math/color.cpp (100%) rename sfw/{ => core}/math/color.h (100%) rename sfw/{ => core}/math/color_names.inc (100%) rename sfw/{ => core}/math/face3.cpp (100%) rename sfw/{ => core}/math/face3.h (100%) rename sfw/{ => core}/math/geometry.cpp (100%) rename sfw/{ => core}/math/geometry.h (100%) rename sfw/{ => core}/math/math_defs.h (100%) rename sfw/{ => core}/math/pcg.cpp (100%) rename sfw/{ => core}/math/pcg.h (100%) rename sfw/{ => core}/math/plane.cpp (100%) rename sfw/{ => core}/math/plane.h (100%) rename sfw/{ => core}/math/projection.cpp (100%) rename sfw/{ => core}/math/projection.h (100%) rename sfw/{ => core}/math/quaternion.cpp (100%) rename sfw/{ => core}/math/quaternion.h (100%) rename sfw/{ => core}/math/random_number_generator.cpp (100%) rename sfw/{ => core}/math/random_number_generator.h (100%) rename sfw/{ => core}/math/random_pcg.cpp (100%) rename sfw/{ => core}/math/random_pcg.h (100%) rename sfw/{ => core}/math/rect2.cpp (100%) rename sfw/{ => core}/math/rect2.h (100%) rename sfw/{ => core}/math/rect2i.cpp (100%) rename sfw/{ => core}/math/rect2i.h (100%) rename sfw/{ => core}/math/transform.cpp (100%) rename sfw/{ => core}/math/transform.h (100%) rename sfw/{ => core}/math/transform_2d.cpp (100%) rename sfw/{ => core}/math/transform_2d.h (100%) rename sfw/{ => core}/math/vector2.cpp (100%) rename sfw/{ => core}/math/vector2.h (100%) rename sfw/{ => core}/math/vector2i.cpp (100%) rename sfw/{ => core}/math/vector2i.h (100%) rename sfw/{ => core}/math/vector3.cpp (100%) rename sfw/{ => core}/math/vector3.h (100%) rename sfw/{ => core}/math/vector3i.cpp (100%) rename sfw/{ => core}/math/vector3i.h (100%) rename sfw/{ => core}/math/vector4.cpp (100%) rename sfw/{ => core}/math/vector4.h (100%) rename sfw/{ => core}/math/vector4i.cpp (100%) rename sfw/{ => core}/math/vector4i.h (100%) rename sfw/{ => core}/memory.h (100%) rename sfw/{ => core/old}/string.cpp (100%) rename sfw/{ => core/old}/string.h (100%) rename sfw/{ => core}/typedefs.h (100%) rename sfw/{string => core}/ucaps.h (100%) rename sfw/{string => core}/ustring.cpp (100%) rename sfw/{string => core}/ustring.h (100%) diff --git a/sfw/image/stb_image.h b/sfw/application/3rd_stb_image.h similarity index 100% rename from sfw/image/stb_image.h rename to sfw/application/3rd_stb_image.h diff --git a/sfw/image/image.cpp b/sfw/application/image.cpp similarity index 100% rename from sfw/image/image.cpp rename to sfw/application/image.cpp diff --git a/sfw/image/image.h b/sfw/application/image.h similarity index 100% rename from sfw/image/image.h rename to sfw/application/image.h diff --git a/sfw/input/SCsub b/sfw/application/input/SCsub similarity index 100% rename from sfw/input/SCsub rename to sfw/application/input/SCsub diff --git a/sfw/input/default_controller_mappings.gen.cpp b/sfw/application/input/default_controller_mappings.gen.cpp similarity index 100% rename from sfw/input/default_controller_mappings.gen.cpp rename to sfw/application/input/default_controller_mappings.gen.cpp diff --git a/sfw/input/default_controller_mappings.h b/sfw/application/input/default_controller_mappings.h similarity index 100% rename from sfw/input/default_controller_mappings.h rename to sfw/application/input/default_controller_mappings.h diff --git a/sfw/input/gamecontrollerdb.txt b/sfw/application/input/gamecontrollerdb.txt similarity index 100% rename from sfw/input/gamecontrollerdb.txt rename to sfw/application/input/gamecontrollerdb.txt diff --git a/sfw/input/input.cpp b/sfw/application/input/input.cpp similarity index 100% rename from sfw/input/input.cpp rename to sfw/application/input/input.cpp diff --git a/sfw/input/input.h b/sfw/application/input/input.h similarity index 100% rename from sfw/input/input.h rename to sfw/application/input/input.h diff --git a/sfw/input/input_builders.py b/sfw/application/input/input_builders.py similarity index 100% rename from sfw/input/input_builders.py rename to sfw/application/input/input_builders.py diff --git a/sfw/input/input_event.cpp b/sfw/application/input/input_event.cpp similarity index 100% rename from sfw/input/input_event.cpp rename to sfw/application/input/input_event.cpp diff --git a/sfw/input/input_event.h b/sfw/application/input/input_event.h similarity index 100% rename from sfw/input/input_event.h rename to sfw/application/input/input_event.h diff --git a/sfw/input/input_map.cpp b/sfw/application/input/input_map.cpp similarity index 100% rename from sfw/input/input_map.cpp rename to sfw/application/input/input_map.cpp diff --git a/sfw/input/input_map.h b/sfw/application/input/input_map.h similarity index 100% rename from sfw/input/input_map.h rename to sfw/application/input/input_map.h diff --git a/sfw/input/pandemoniumcontrollerdb.txt b/sfw/application/input/pandemoniumcontrollerdb.txt similarity index 100% rename from sfw/input/pandemoniumcontrollerdb.txt rename to sfw/application/input/pandemoniumcontrollerdb.txt diff --git a/sfw/input/shortcut.cpp b/sfw/application/input/shortcut.cpp similarity index 100% rename from sfw/input/shortcut.cpp rename to sfw/application/input/shortcut.cpp diff --git a/sfw/input/shortcut.h b/sfw/application/input/shortcut.h similarity index 100% rename from sfw/input/shortcut.h rename to sfw/application/input/shortcut.h diff --git a/sfw/object.cpp b/sfw/application/object.cpp similarity index 100% rename from sfw/object.cpp rename to sfw/application/object.cpp diff --git a/sfw/object.h b/sfw/application/object.h similarity index 100% rename from sfw/object.h rename to sfw/application/object.h diff --git a/sfw/reference.cpp b/sfw/application/reference.cpp similarity index 100% rename from sfw/reference.cpp rename to sfw/application/reference.cpp diff --git a/sfw/reference.h b/sfw/application/reference.h similarity index 100% rename from sfw/reference.h rename to sfw/application/reference.h diff --git a/sfw/signal.cpp b/sfw/application/signal.cpp similarity index 100% rename from sfw/signal.cpp rename to sfw/application/signal.cpp diff --git a/sfw/signal.h b/sfw/application/signal.h similarity index 100% rename from sfw/signal.h rename to sfw/application/signal.h diff --git a/sfw/variant.cpp b/sfw/application/variant.cpp similarity index 100% rename from sfw/variant.cpp rename to sfw/application/variant.cpp diff --git a/sfw/variant.h b/sfw/application/variant.h similarity index 100% rename from sfw/variant.h rename to sfw/application/variant.h diff --git a/sfw/os/tinydir.h b/sfw/core/3rd_tinydir.h similarity index 100% rename from sfw/os/tinydir.h rename to sfw/core/3rd_tinydir.h diff --git a/sfw/string/char_range.inc b/sfw/core/char_range.inc similarity index 100% rename from sfw/string/char_range.inc rename to sfw/core/char_range.inc diff --git a/sfw/string/char_utils.h b/sfw/core/char_utils.h similarity index 100% rename from sfw/string/char_utils.h rename to sfw/core/char_utils.h diff --git a/sfw/containers/cowdata.h b/sfw/core/containers/cowdata.h similarity index 100% rename from sfw/containers/cowdata.h rename to sfw/core/containers/cowdata.h diff --git a/sfw/containers/hash_map.h b/sfw/core/containers/hash_map.h similarity index 100% rename from sfw/containers/hash_map.h rename to sfw/core/containers/hash_map.h diff --git a/sfw/containers/hash_set.h b/sfw/core/containers/hash_set.h similarity index 100% rename from sfw/containers/hash_set.h rename to sfw/core/containers/hash_set.h diff --git a/sfw/containers/hashfuncs.h b/sfw/core/containers/hashfuncs.h similarity index 100% rename from sfw/containers/hashfuncs.h rename to sfw/core/containers/hashfuncs.h diff --git a/sfw/containers/list.h b/sfw/core/containers/list.h similarity index 100% rename from sfw/containers/list.h rename to sfw/core/containers/list.h diff --git a/sfw/containers/local_vector.h b/sfw/core/containers/local_vector.h similarity index 100% rename from sfw/containers/local_vector.h rename to sfw/core/containers/local_vector.h diff --git a/sfw/containers/paged_allocator.h b/sfw/core/containers/paged_allocator.h similarity index 100% rename from sfw/containers/paged_allocator.h rename to sfw/core/containers/paged_allocator.h diff --git a/sfw/containers/pair.h b/sfw/core/containers/pair.h similarity index 100% rename from sfw/containers/pair.h rename to sfw/core/containers/pair.h diff --git a/sfw/containers/queue.h b/sfw/core/containers/queue.h similarity index 100% rename from sfw/containers/queue.h rename to sfw/core/containers/queue.h diff --git a/sfw/containers/rb_map.h b/sfw/core/containers/rb_map.h similarity index 100% rename from sfw/containers/rb_map.h rename to sfw/core/containers/rb_map.h diff --git a/sfw/containers/rb_set.h b/sfw/core/containers/rb_set.h similarity index 100% rename from sfw/containers/rb_set.h rename to sfw/core/containers/rb_set.h diff --git a/sfw/containers/ring_buffer.h b/sfw/core/containers/ring_buffer.h similarity index 100% rename from sfw/containers/ring_buffer.h rename to sfw/core/containers/ring_buffer.h diff --git a/sfw/containers/rvector.h b/sfw/core/containers/rvector.h similarity index 100% rename from sfw/containers/rvector.h rename to sfw/core/containers/rvector.h diff --git a/sfw/containers/tight_local_vector.h b/sfw/core/containers/tight_local_vector.h similarity index 100% rename from sfw/containers/tight_local_vector.h rename to sfw/core/containers/tight_local_vector.h diff --git a/sfw/containers/vector.h b/sfw/core/containers/vector.h similarity index 100% rename from sfw/containers/vector.h rename to sfw/core/containers/vector.h diff --git a/sfw/containers/vmap.h b/sfw/core/containers/vmap.h similarity index 100% rename from sfw/containers/vmap.h rename to sfw/core/containers/vmap.h diff --git a/sfw/containers/vset.h b/sfw/core/containers/vset.h similarity index 100% rename from sfw/containers/vset.h rename to sfw/core/containers/vset.h diff --git a/sfw/os/directory.cpp b/sfw/core/directory.cpp similarity index 100% rename from sfw/os/directory.cpp rename to sfw/core/directory.cpp diff --git a/sfw/os/directory.h b/sfw/core/directory.h similarity index 97% rename from sfw/os/directory.h rename to sfw/core/directory.h index 9325df4..77de115 100644 --- a/sfw/os/directory.h +++ b/sfw/core/directory.h @@ -3,7 +3,7 @@ #include "core/string.h" #include "core/error_list.h" -#include +#include "3rd_tinydir.h" #include "core/reference.h" diff --git a/sfw/error_list.h b/sfw/core/error_list.h similarity index 100% rename from sfw/error_list.h rename to sfw/core/error_list.h diff --git a/sfw/error_macros.h b/sfw/core/error_macros.h similarity index 100% rename from sfw/error_macros.h rename to sfw/core/error_macros.h diff --git a/sfw/int_types.h b/sfw/core/int_types.h similarity index 100% rename from sfw/int_types.h rename to sfw/core/int_types.h diff --git a/sfw/log/logger.cpp b/sfw/core/logger.cpp similarity index 100% rename from sfw/log/logger.cpp rename to sfw/core/logger.cpp diff --git a/sfw/log/logger.h b/sfw/core/logger.h similarity index 100% rename from sfw/log/logger.h rename to sfw/core/logger.h diff --git a/sfw/math/aabb.cpp b/sfw/core/math/aabb.cpp similarity index 100% rename from sfw/math/aabb.cpp rename to sfw/core/math/aabb.cpp diff --git a/sfw/math/aabb.h b/sfw/core/math/aabb.h similarity index 100% rename from sfw/math/aabb.h rename to sfw/core/math/aabb.h diff --git a/sfw/math/basis.cpp b/sfw/core/math/basis.cpp similarity index 100% rename from sfw/math/basis.cpp rename to sfw/core/math/basis.cpp diff --git a/sfw/math/basis.h b/sfw/core/math/basis.h similarity index 100% rename from sfw/math/basis.h rename to sfw/core/math/basis.h diff --git a/sfw/math/color.cpp b/sfw/core/math/color.cpp similarity index 100% rename from sfw/math/color.cpp rename to sfw/core/math/color.cpp diff --git a/sfw/math/color.h b/sfw/core/math/color.h similarity index 100% rename from sfw/math/color.h rename to sfw/core/math/color.h diff --git a/sfw/math/color_names.inc b/sfw/core/math/color_names.inc similarity index 100% rename from sfw/math/color_names.inc rename to sfw/core/math/color_names.inc diff --git a/sfw/math/face3.cpp b/sfw/core/math/face3.cpp similarity index 100% rename from sfw/math/face3.cpp rename to sfw/core/math/face3.cpp diff --git a/sfw/math/face3.h b/sfw/core/math/face3.h similarity index 100% rename from sfw/math/face3.h rename to sfw/core/math/face3.h diff --git a/sfw/math/geometry.cpp b/sfw/core/math/geometry.cpp similarity index 100% rename from sfw/math/geometry.cpp rename to sfw/core/math/geometry.cpp diff --git a/sfw/math/geometry.h b/sfw/core/math/geometry.h similarity index 100% rename from sfw/math/geometry.h rename to sfw/core/math/geometry.h diff --git a/sfw/math/math_defs.h b/sfw/core/math/math_defs.h similarity index 100% rename from sfw/math/math_defs.h rename to sfw/core/math/math_defs.h diff --git a/sfw/math/pcg.cpp b/sfw/core/math/pcg.cpp similarity index 100% rename from sfw/math/pcg.cpp rename to sfw/core/math/pcg.cpp diff --git a/sfw/math/pcg.h b/sfw/core/math/pcg.h similarity index 100% rename from sfw/math/pcg.h rename to sfw/core/math/pcg.h diff --git a/sfw/math/plane.cpp b/sfw/core/math/plane.cpp similarity index 100% rename from sfw/math/plane.cpp rename to sfw/core/math/plane.cpp diff --git a/sfw/math/plane.h b/sfw/core/math/plane.h similarity index 100% rename from sfw/math/plane.h rename to sfw/core/math/plane.h diff --git a/sfw/math/projection.cpp b/sfw/core/math/projection.cpp similarity index 100% rename from sfw/math/projection.cpp rename to sfw/core/math/projection.cpp diff --git a/sfw/math/projection.h b/sfw/core/math/projection.h similarity index 100% rename from sfw/math/projection.h rename to sfw/core/math/projection.h diff --git a/sfw/math/quaternion.cpp b/sfw/core/math/quaternion.cpp similarity index 100% rename from sfw/math/quaternion.cpp rename to sfw/core/math/quaternion.cpp diff --git a/sfw/math/quaternion.h b/sfw/core/math/quaternion.h similarity index 100% rename from sfw/math/quaternion.h rename to sfw/core/math/quaternion.h diff --git a/sfw/math/random_number_generator.cpp b/sfw/core/math/random_number_generator.cpp similarity index 100% rename from sfw/math/random_number_generator.cpp rename to sfw/core/math/random_number_generator.cpp diff --git a/sfw/math/random_number_generator.h b/sfw/core/math/random_number_generator.h similarity index 100% rename from sfw/math/random_number_generator.h rename to sfw/core/math/random_number_generator.h diff --git a/sfw/math/random_pcg.cpp b/sfw/core/math/random_pcg.cpp similarity index 100% rename from sfw/math/random_pcg.cpp rename to sfw/core/math/random_pcg.cpp diff --git a/sfw/math/random_pcg.h b/sfw/core/math/random_pcg.h similarity index 100% rename from sfw/math/random_pcg.h rename to sfw/core/math/random_pcg.h diff --git a/sfw/math/rect2.cpp b/sfw/core/math/rect2.cpp similarity index 100% rename from sfw/math/rect2.cpp rename to sfw/core/math/rect2.cpp diff --git a/sfw/math/rect2.h b/sfw/core/math/rect2.h similarity index 100% rename from sfw/math/rect2.h rename to sfw/core/math/rect2.h diff --git a/sfw/math/rect2i.cpp b/sfw/core/math/rect2i.cpp similarity index 100% rename from sfw/math/rect2i.cpp rename to sfw/core/math/rect2i.cpp diff --git a/sfw/math/rect2i.h b/sfw/core/math/rect2i.h similarity index 100% rename from sfw/math/rect2i.h rename to sfw/core/math/rect2i.h diff --git a/sfw/math/transform.cpp b/sfw/core/math/transform.cpp similarity index 100% rename from sfw/math/transform.cpp rename to sfw/core/math/transform.cpp diff --git a/sfw/math/transform.h b/sfw/core/math/transform.h similarity index 100% rename from sfw/math/transform.h rename to sfw/core/math/transform.h diff --git a/sfw/math/transform_2d.cpp b/sfw/core/math/transform_2d.cpp similarity index 100% rename from sfw/math/transform_2d.cpp rename to sfw/core/math/transform_2d.cpp diff --git a/sfw/math/transform_2d.h b/sfw/core/math/transform_2d.h similarity index 100% rename from sfw/math/transform_2d.h rename to sfw/core/math/transform_2d.h diff --git a/sfw/math/vector2.cpp b/sfw/core/math/vector2.cpp similarity index 100% rename from sfw/math/vector2.cpp rename to sfw/core/math/vector2.cpp diff --git a/sfw/math/vector2.h b/sfw/core/math/vector2.h similarity index 100% rename from sfw/math/vector2.h rename to sfw/core/math/vector2.h diff --git a/sfw/math/vector2i.cpp b/sfw/core/math/vector2i.cpp similarity index 100% rename from sfw/math/vector2i.cpp rename to sfw/core/math/vector2i.cpp diff --git a/sfw/math/vector2i.h b/sfw/core/math/vector2i.h similarity index 100% rename from sfw/math/vector2i.h rename to sfw/core/math/vector2i.h diff --git a/sfw/math/vector3.cpp b/sfw/core/math/vector3.cpp similarity index 100% rename from sfw/math/vector3.cpp rename to sfw/core/math/vector3.cpp diff --git a/sfw/math/vector3.h b/sfw/core/math/vector3.h similarity index 100% rename from sfw/math/vector3.h rename to sfw/core/math/vector3.h diff --git a/sfw/math/vector3i.cpp b/sfw/core/math/vector3i.cpp similarity index 100% rename from sfw/math/vector3i.cpp rename to sfw/core/math/vector3i.cpp diff --git a/sfw/math/vector3i.h b/sfw/core/math/vector3i.h similarity index 100% rename from sfw/math/vector3i.h rename to sfw/core/math/vector3i.h diff --git a/sfw/math/vector4.cpp b/sfw/core/math/vector4.cpp similarity index 100% rename from sfw/math/vector4.cpp rename to sfw/core/math/vector4.cpp diff --git a/sfw/math/vector4.h b/sfw/core/math/vector4.h similarity index 100% rename from sfw/math/vector4.h rename to sfw/core/math/vector4.h diff --git a/sfw/math/vector4i.cpp b/sfw/core/math/vector4i.cpp similarity index 100% rename from sfw/math/vector4i.cpp rename to sfw/core/math/vector4i.cpp diff --git a/sfw/math/vector4i.h b/sfw/core/math/vector4i.h similarity index 100% rename from sfw/math/vector4i.h rename to sfw/core/math/vector4i.h diff --git a/sfw/memory.h b/sfw/core/memory.h similarity index 100% rename from sfw/memory.h rename to sfw/core/memory.h diff --git a/sfw/string.cpp b/sfw/core/old/string.cpp similarity index 100% rename from sfw/string.cpp rename to sfw/core/old/string.cpp diff --git a/sfw/string.h b/sfw/core/old/string.h similarity index 100% rename from sfw/string.h rename to sfw/core/old/string.h diff --git a/sfw/typedefs.h b/sfw/core/typedefs.h similarity index 100% rename from sfw/typedefs.h rename to sfw/core/typedefs.h diff --git a/sfw/string/ucaps.h b/sfw/core/ucaps.h similarity index 100% rename from sfw/string/ucaps.h rename to sfw/core/ucaps.h diff --git a/sfw/string/ustring.cpp b/sfw/core/ustring.cpp similarity index 100% rename from sfw/string/ustring.cpp rename to sfw/core/ustring.cpp diff --git a/sfw/string/ustring.h b/sfw/core/ustring.h similarity index 100% rename from sfw/string/ustring.h rename to sfw/core/ustring.h