From 147d547ac45da0a4100affe149d277684b505c57 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Wed, 20 Dec 2023 14:37:46 +0100
Subject: [PATCH] Moved core classes under core folder.

---
 compile_linux.sh                    | 94 ++++++++++++++---------------
 sfw/{ => core}/aabb.cpp             |  0
 sfw/{ => core}/aabb.h               |  0
 sfw/{ => core}/basis.cpp            |  0
 sfw/{ => core}/basis.h              |  0
 sfw/{ => core}/char_range.inc       |  0
 sfw/{ => core}/char_utils.h         |  0
 sfw/{ => core}/color.cpp            |  0
 sfw/{ => core}/color.h              |  0
 sfw/{ => core}/cowdata.h            |  0
 sfw/{ => core}/error_list.h         |  0
 sfw/{ => core}/error_macros.h       |  0
 sfw/{ => core}/face3.cpp            |  0
 sfw/{ => core}/face3.h              |  0
 sfw/{ => core}/hash_map.h           |  0
 sfw/{ => core}/hash_set.h           |  0
 sfw/{ => core}/hashfuncs.h          |  0
 sfw/{ => core}/int_types.h          |  0
 sfw/{ => core}/list.h               |  0
 sfw/{ => core}/local_vector.h       |  0
 sfw/{ => core}/logger.cpp           |  0
 sfw/{ => core}/logger.h             |  0
 sfw/{ => core}/math_defs.h          |  0
 sfw/{ => core}/math_funcs.cpp       |  0
 sfw/{ => core}/math_funcs.h         |  0
 sfw/{ => core}/memory.cpp           |  0
 sfw/{ => core}/memory.h             |  0
 sfw/{ => core}/mutex.cpp            |  0
 sfw/{ => core}/mutex.h              |  0
 sfw/core/{ => old}/3rd_tinydir.h    |  0
 sfw/core/{ => old}/directory.cpp    |  0
 sfw/core/{ => old}/directory.h      |  0
 sfw/core/old/{ => old}/string.cpp   |  0
 sfw/core/old/{ => old}/string.h     |  0
 sfw/{ => core}/paged_allocator.h    |  0
 sfw/{ => core}/pair.h               |  0
 sfw/{ => core}/pcg.cpp              |  0
 sfw/{ => core}/pcg.h                |  0
 sfw/{ => core}/plane.cpp            |  0
 sfw/{ => core}/plane.h              |  0
 sfw/{ => core}/pool_allocator.cpp   |  0
 sfw/{ => core}/pool_allocator.h     |  0
 sfw/{ => core}/pool_vector.cpp      |  0
 sfw/{ => core}/pool_vector.h        |  0
 sfw/{ => core}/projection.cpp       |  0
 sfw/{ => core}/projection.h         |  0
 sfw/{ => core}/quaternion.cpp       |  0
 sfw/{ => core}/quaternion.h         |  0
 sfw/{ => core}/queue.h              |  0
 sfw/{ => core}/random_pcg.cpp       |  0
 sfw/{ => core}/random_pcg.h         |  0
 sfw/{ => core}/rb_map.h             |  0
 sfw/{ => core}/rb_set.h             |  0
 sfw/{ => core}/rect2.cpp            |  0
 sfw/{ => core}/rect2.h              |  0
 sfw/{ => core}/rect2i.cpp           |  0
 sfw/{ => core}/rect2i.h             |  0
 sfw/{ => core}/ring_buffer.h        |  0
 sfw/{ => core}/rvector.h            |  0
 sfw/{ => core}/rw_lock.h            |  0
 sfw/{ => core}/safe_refcount.cpp    |  0
 sfw/{ => core}/safe_refcount.h      |  0
 sfw/{ => core}/sort_array.h         |  0
 sfw/{ => core}/stime.cpp            |  0
 sfw/{ => core}/stime.h              |  0
 sfw/{ => core}/tight_local_vector.h |  0
 sfw/{ => core}/transform.cpp        |  0
 sfw/{ => core}/transform.h          |  0
 sfw/{ => core}/transform_2d.cpp     |  0
 sfw/{ => core}/transform_2d.h       |  0
 sfw/{ => core}/typedefs.h           |  0
 sfw/{ => core}/ucaps.h              |  0
 sfw/{ => core}/ustring.cpp          |  0
 sfw/{ => core}/ustring.h            |  0
 sfw/{ => core}/vector.h             |  0
 sfw/{ => core}/vector2.cpp          |  0
 sfw/{ => core}/vector2.h            |  0
 sfw/{ => core}/vector2i.cpp         |  0
 sfw/{ => core}/vector2i.h           |  0
 sfw/{ => core}/vector3.cpp          |  0
 sfw/{ => core}/vector3.h            |  0
 sfw/{ => core}/vector3i.cpp         |  0
 sfw/{ => core}/vector3i.h           |  0
 sfw/{ => core}/vector4.cpp          |  0
 sfw/{ => core}/vector4.h            |  0
 sfw/{ => core}/vector4i.cpp         |  0
 sfw/{ => core}/vector4i.h           |  0
 sfw/{ => core}/vmap.h               |  0
 sfw/{ => core}/vset.h               |  0
 89 files changed, 47 insertions(+), 47 deletions(-)
 rename sfw/{ => core}/aabb.cpp (100%)
 rename sfw/{ => core}/aabb.h (100%)
 rename sfw/{ => core}/basis.cpp (100%)
 rename sfw/{ => core}/basis.h (100%)
 rename sfw/{ => core}/char_range.inc (100%)
 rename sfw/{ => core}/char_utils.h (100%)
 rename sfw/{ => core}/color.cpp (100%)
 rename sfw/{ => core}/color.h (100%)
 rename sfw/{ => core}/cowdata.h (100%)
 rename sfw/{ => core}/error_list.h (100%)
 rename sfw/{ => core}/error_macros.h (100%)
 rename sfw/{ => core}/face3.cpp (100%)
 rename sfw/{ => core}/face3.h (100%)
 rename sfw/{ => core}/hash_map.h (100%)
 rename sfw/{ => core}/hash_set.h (100%)
 rename sfw/{ => core}/hashfuncs.h (100%)
 rename sfw/{ => core}/int_types.h (100%)
 rename sfw/{ => core}/list.h (100%)
 rename sfw/{ => core}/local_vector.h (100%)
 rename sfw/{ => core}/logger.cpp (100%)
 rename sfw/{ => core}/logger.h (100%)
 rename sfw/{ => core}/math_defs.h (100%)
 rename sfw/{ => core}/math_funcs.cpp (100%)
 rename sfw/{ => core}/math_funcs.h (100%)
 rename sfw/{ => core}/memory.cpp (100%)
 rename sfw/{ => core}/memory.h (100%)
 rename sfw/{ => core}/mutex.cpp (100%)
 rename sfw/{ => core}/mutex.h (100%)
 rename sfw/core/{ => old}/3rd_tinydir.h (100%)
 rename sfw/core/{ => old}/directory.cpp (100%)
 rename sfw/core/{ => old}/directory.h (100%)
 rename sfw/core/old/{ => old}/string.cpp (100%)
 rename sfw/core/old/{ => old}/string.h (100%)
 rename sfw/{ => core}/paged_allocator.h (100%)
 rename sfw/{ => core}/pair.h (100%)
 rename sfw/{ => core}/pcg.cpp (100%)
 rename sfw/{ => core}/pcg.h (100%)
 rename sfw/{ => core}/plane.cpp (100%)
 rename sfw/{ => core}/plane.h (100%)
 rename sfw/{ => core}/pool_allocator.cpp (100%)
 rename sfw/{ => core}/pool_allocator.h (100%)
 rename sfw/{ => core}/pool_vector.cpp (100%)
 rename sfw/{ => core}/pool_vector.h (100%)
 rename sfw/{ => core}/projection.cpp (100%)
 rename sfw/{ => core}/projection.h (100%)
 rename sfw/{ => core}/quaternion.cpp (100%)
 rename sfw/{ => core}/quaternion.h (100%)
 rename sfw/{ => core}/queue.h (100%)
 rename sfw/{ => core}/random_pcg.cpp (100%)
 rename sfw/{ => core}/random_pcg.h (100%)
 rename sfw/{ => core}/rb_map.h (100%)
 rename sfw/{ => core}/rb_set.h (100%)
 rename sfw/{ => core}/rect2.cpp (100%)
 rename sfw/{ => core}/rect2.h (100%)
 rename sfw/{ => core}/rect2i.cpp (100%)
 rename sfw/{ => core}/rect2i.h (100%)
 rename sfw/{ => core}/ring_buffer.h (100%)
 rename sfw/{ => core}/rvector.h (100%)
 rename sfw/{ => core}/rw_lock.h (100%)
 rename sfw/{ => core}/safe_refcount.cpp (100%)
 rename sfw/{ => core}/safe_refcount.h (100%)
 rename sfw/{ => core}/sort_array.h (100%)
 rename sfw/{ => core}/stime.cpp (100%)
 rename sfw/{ => core}/stime.h (100%)
 rename sfw/{ => core}/tight_local_vector.h (100%)
 rename sfw/{ => core}/transform.cpp (100%)
 rename sfw/{ => core}/transform.h (100%)
 rename sfw/{ => core}/transform_2d.cpp (100%)
 rename sfw/{ => core}/transform_2d.h (100%)
 rename sfw/{ => core}/typedefs.h (100%)
 rename sfw/{ => core}/ucaps.h (100%)
 rename sfw/{ => core}/ustring.cpp (100%)
 rename sfw/{ => core}/ustring.h (100%)
 rename sfw/{ => core}/vector.h (100%)
 rename sfw/{ => core}/vector2.cpp (100%)
 rename sfw/{ => core}/vector2.h (100%)
 rename sfw/{ => core}/vector2i.cpp (100%)
 rename sfw/{ => core}/vector2i.h (100%)
 rename sfw/{ => core}/vector3.cpp (100%)
 rename sfw/{ => core}/vector3.h (100%)
 rename sfw/{ => core}/vector3i.cpp (100%)
 rename sfw/{ => core}/vector3i.h (100%)
 rename sfw/{ => core}/vector4.cpp (100%)
 rename sfw/{ => core}/vector4.h (100%)
 rename sfw/{ => core}/vector4i.cpp (100%)
 rename sfw/{ => core}/vector4i.h (100%)
 rename sfw/{ => core}/vmap.h (100%)
 rename sfw/{ => core}/vset.h (100%)

diff --git a/compile_linux.sh b/compile_linux.sh
index d50a1a4..b1acb63 100755
--- a/compile_linux.sh
+++ b/compile_linux.sh
@@ -7,60 +7,60 @@
 #g++ main.cpp shader.cpp material.cpp mesh.cpp mesh_instance.cpp mesh_utils.cpp texture.cpp camera.cpp application.cpp scene.cpp game_scene.cpp object_2d.cpp tile_map.cpp sprite.cpp \
 #    -g -Wall -o3 -o ./bin/game $(pkg-config --cflags --libs sdl2 glew)
 
-#g++ -Wall -fexceptions -I/usr/include/SDL2 -D_REENTRANT -g -Isfw -c sfw/aabb.cpp -o sfw/aabb.o
+#g++ -Wall -fexceptions -I/usr/include/SDL2 -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/aabb.cpp -o sfw/core/aabb.o
 
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/aabb.cpp -o sfw/aabb.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/basis.cpp -o sfw/basis.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/color.cpp -o sfw/color.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/face3.cpp -o sfw/face3.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/logger.cpp -o sfw/logger.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/math_funcs.cpp -o sfw/math_funcs.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/memory.cpp -o sfw/memory.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/pcg.cpp -o sfw/pcg.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/plane.cpp -o sfw/plane.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/projection.cpp -o sfw/projection.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/quaternion.cpp -o sfw/quaternion.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/random_pcg.cpp -o sfw/random_pcg.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/rect2.cpp -o sfw/rect2.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/rect2i.cpp -o sfw/rect2i.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/safe_refcount.cpp -o sfw/safe_refcount.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/transform_2d.cpp -o sfw/transform_2d.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/transform.cpp -o sfw/transform.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/ustring.cpp -o sfw/ustring.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/vector2.cpp -o sfw/vector2.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/vector2i.cpp -o sfw/vector2i.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/vector3.cpp -o sfw/vector3.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/vector3i.cpp -o sfw/vector3i.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/vector4.cpp -o sfw/vector4.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/vector4i.cpp -o sfw/vector4i.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/aabb.cpp -o sfw/core/aabb.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/basis.cpp -o sfw/core/basis.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/color.cpp -o sfw/core/color.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/face3.cpp -o sfw/core/face3.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/logger.cpp -o sfw/core/logger.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/math_funcs.cpp -o sfw/core/math_funcs.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/memory.cpp -o sfw/core/memory.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/pcg.cpp -o sfw/core/pcg.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/plane.cpp -o sfw/core/plane.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/projection.cpp -o sfw/core/projection.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/quaternion.cpp -o sfw/core/quaternion.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/random_pcg.cpp -o sfw/core/random_pcg.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/rect2.cpp -o sfw/core/rect2.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/rect2i.cpp -o sfw/core/rect2i.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/safe_refcount.cpp -o sfw/core/safe_refcount.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/transform_2d.cpp -o sfw/core/transform_2d.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/transform.cpp -o sfw/core/transform.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/ustring.cpp -o sfw/core/ustring.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/vector2.cpp -o sfw/core/vector2.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/vector2i.cpp -o sfw/core/vector2i.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/vector3.cpp -o sfw/core/vector3.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/vector3i.cpp -o sfw/core/vector3i.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/vector4.cpp -o sfw/core/vector4.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/vector4i.cpp -o sfw/core/vector4i.o
 
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/pool_vector.cpp -o sfw/pool_vector.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/pool_allocator.cpp -o sfw/pool_allocator.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/mutex.cpp -o sfw/mutex.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -c sfw/stime.cpp -o sfw/stime.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/pool_vector.cpp -o sfw/core/pool_vector.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/pool_allocator.cpp -o sfw/core/pool_allocator.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/mutex.cpp -o sfw/core/mutex.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -c sfw/core/stime.cpp -o sfw/core/stime.o
 
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/application.cpp -o sfw/application/application.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/scene.cpp -o sfw/application/scene.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/window.cpp -o sfw/application/window.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw -Isfw/application -c sfw/application/application.cpp -o sfw/application/application.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/scene.cpp -o sfw/application/scene.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/window.cpp -o sfw/application/window.o
 
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/shader.cpp -o sfw/application/shader.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/material.cpp -o sfw/application/material.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/mesh.cpp -o sfw/application/mesh.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/mesh_utils.cpp -o sfw/application/mesh_utils.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/texture.cpp -o sfw/application/texture.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/shader.cpp -o sfw/application/shader.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/material.cpp -o sfw/application/material.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/mesh.cpp -o sfw/application/mesh.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/mesh_utils.cpp -o sfw/application/mesh_utils.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/texture.cpp -o sfw/application/texture.o
 
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/camera_3d.cpp -o sfw/application/camera_3d.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/object_3d.cpp -o sfw/application/object_3d.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/mesh_instance_3d.cpp -o sfw/application/mesh_instance_3d.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/camera_3d.cpp -o sfw/application/camera_3d.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/object_3d.cpp -o sfw/application/object_3d.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/mesh_instance_3d.cpp -o sfw/application/mesh_instance_3d.o
 
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/camera_2d.cpp -o sfw/application/camera_2d.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/mesh_instance_2d.cpp -o sfw/application/mesh_instance_2d.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/object_2d.cpp -o sfw/application/object_2d.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/sprite.cpp -o sfw/application/sprite.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c sfw/application/tile_map.cpp -o sfw/application/tile_map.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/camera_2d.cpp -o sfw/application/camera_2d.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/mesh_instance_2d.cpp -o sfw/application/mesh_instance_2d.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/object_2d.cpp -o sfw/application/object_2d.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/sprite.cpp -o sfw/application/sprite.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c sfw/application/tile_map.cpp -o sfw/application/tile_map.o
 
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c game_scene.cpp -o game_scene.o
-ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/application -c main.cpp -o main.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c game_scene.cpp -o game_scene.o
+ccache g++ -Wall -D_REENTRANT -g -Isfw -Isfw/core -Isfw/application -c main.cpp -o main.o
 
 
 ccache g++ -Wall -lm -ldl -lpthread -lX11  -D_REENTRANT -g sfw/aabb.o sfw/basis.o sfw/color.o sfw/face3.o sfw/logger.o sfw/math_funcs.o \
diff --git a/sfw/aabb.cpp b/sfw/core/aabb.cpp
similarity index 100%
rename from sfw/aabb.cpp
rename to sfw/core/aabb.cpp
diff --git a/sfw/aabb.h b/sfw/core/aabb.h
similarity index 100%
rename from sfw/aabb.h
rename to sfw/core/aabb.h
diff --git a/sfw/basis.cpp b/sfw/core/basis.cpp
similarity index 100%
rename from sfw/basis.cpp
rename to sfw/core/basis.cpp
diff --git a/sfw/basis.h b/sfw/core/basis.h
similarity index 100%
rename from sfw/basis.h
rename to sfw/core/basis.h
diff --git a/sfw/char_range.inc b/sfw/core/char_range.inc
similarity index 100%
rename from sfw/char_range.inc
rename to sfw/core/char_range.inc
diff --git a/sfw/char_utils.h b/sfw/core/char_utils.h
similarity index 100%
rename from sfw/char_utils.h
rename to sfw/core/char_utils.h
diff --git a/sfw/color.cpp b/sfw/core/color.cpp
similarity index 100%
rename from sfw/color.cpp
rename to sfw/core/color.cpp
diff --git a/sfw/color.h b/sfw/core/color.h
similarity index 100%
rename from sfw/color.h
rename to sfw/core/color.h
diff --git a/sfw/cowdata.h b/sfw/core/cowdata.h
similarity index 100%
rename from sfw/cowdata.h
rename to sfw/core/cowdata.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/face3.cpp b/sfw/core/face3.cpp
similarity index 100%
rename from sfw/face3.cpp
rename to sfw/core/face3.cpp
diff --git a/sfw/face3.h b/sfw/core/face3.h
similarity index 100%
rename from sfw/face3.h
rename to sfw/core/face3.h
diff --git a/sfw/hash_map.h b/sfw/core/hash_map.h
similarity index 100%
rename from sfw/hash_map.h
rename to sfw/core/hash_map.h
diff --git a/sfw/hash_set.h b/sfw/core/hash_set.h
similarity index 100%
rename from sfw/hash_set.h
rename to sfw/core/hash_set.h
diff --git a/sfw/hashfuncs.h b/sfw/core/hashfuncs.h
similarity index 100%
rename from sfw/hashfuncs.h
rename to sfw/core/hashfuncs.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/list.h b/sfw/core/list.h
similarity index 100%
rename from sfw/list.h
rename to sfw/core/list.h
diff --git a/sfw/local_vector.h b/sfw/core/local_vector.h
similarity index 100%
rename from sfw/local_vector.h
rename to sfw/core/local_vector.h
diff --git a/sfw/logger.cpp b/sfw/core/logger.cpp
similarity index 100%
rename from sfw/logger.cpp
rename to sfw/core/logger.cpp
diff --git a/sfw/logger.h b/sfw/core/logger.h
similarity index 100%
rename from sfw/logger.h
rename to sfw/core/logger.h
diff --git a/sfw/math_defs.h b/sfw/core/math_defs.h
similarity index 100%
rename from sfw/math_defs.h
rename to sfw/core/math_defs.h
diff --git a/sfw/math_funcs.cpp b/sfw/core/math_funcs.cpp
similarity index 100%
rename from sfw/math_funcs.cpp
rename to sfw/core/math_funcs.cpp
diff --git a/sfw/math_funcs.h b/sfw/core/math_funcs.h
similarity index 100%
rename from sfw/math_funcs.h
rename to sfw/core/math_funcs.h
diff --git a/sfw/memory.cpp b/sfw/core/memory.cpp
similarity index 100%
rename from sfw/memory.cpp
rename to sfw/core/memory.cpp
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/mutex.cpp b/sfw/core/mutex.cpp
similarity index 100%
rename from sfw/mutex.cpp
rename to sfw/core/mutex.cpp
diff --git a/sfw/mutex.h b/sfw/core/mutex.h
similarity index 100%
rename from sfw/mutex.h
rename to sfw/core/mutex.h
diff --git a/sfw/core/3rd_tinydir.h b/sfw/core/old/3rd_tinydir.h
similarity index 100%
rename from sfw/core/3rd_tinydir.h
rename to sfw/core/old/3rd_tinydir.h
diff --git a/sfw/core/directory.cpp b/sfw/core/old/directory.cpp
similarity index 100%
rename from sfw/core/directory.cpp
rename to sfw/core/old/directory.cpp
diff --git a/sfw/core/directory.h b/sfw/core/old/directory.h
similarity index 100%
rename from sfw/core/directory.h
rename to sfw/core/old/directory.h
diff --git a/sfw/core/old/string.cpp b/sfw/core/old/old/string.cpp
similarity index 100%
rename from sfw/core/old/string.cpp
rename to sfw/core/old/old/string.cpp
diff --git a/sfw/core/old/string.h b/sfw/core/old/old/string.h
similarity index 100%
rename from sfw/core/old/string.h
rename to sfw/core/old/old/string.h
diff --git a/sfw/paged_allocator.h b/sfw/core/paged_allocator.h
similarity index 100%
rename from sfw/paged_allocator.h
rename to sfw/core/paged_allocator.h
diff --git a/sfw/pair.h b/sfw/core/pair.h
similarity index 100%
rename from sfw/pair.h
rename to sfw/core/pair.h
diff --git a/sfw/pcg.cpp b/sfw/core/pcg.cpp
similarity index 100%
rename from sfw/pcg.cpp
rename to sfw/core/pcg.cpp
diff --git a/sfw/pcg.h b/sfw/core/pcg.h
similarity index 100%
rename from sfw/pcg.h
rename to sfw/core/pcg.h
diff --git a/sfw/plane.cpp b/sfw/core/plane.cpp
similarity index 100%
rename from sfw/plane.cpp
rename to sfw/core/plane.cpp
diff --git a/sfw/plane.h b/sfw/core/plane.h
similarity index 100%
rename from sfw/plane.h
rename to sfw/core/plane.h
diff --git a/sfw/pool_allocator.cpp b/sfw/core/pool_allocator.cpp
similarity index 100%
rename from sfw/pool_allocator.cpp
rename to sfw/core/pool_allocator.cpp
diff --git a/sfw/pool_allocator.h b/sfw/core/pool_allocator.h
similarity index 100%
rename from sfw/pool_allocator.h
rename to sfw/core/pool_allocator.h
diff --git a/sfw/pool_vector.cpp b/sfw/core/pool_vector.cpp
similarity index 100%
rename from sfw/pool_vector.cpp
rename to sfw/core/pool_vector.cpp
diff --git a/sfw/pool_vector.h b/sfw/core/pool_vector.h
similarity index 100%
rename from sfw/pool_vector.h
rename to sfw/core/pool_vector.h
diff --git a/sfw/projection.cpp b/sfw/core/projection.cpp
similarity index 100%
rename from sfw/projection.cpp
rename to sfw/core/projection.cpp
diff --git a/sfw/projection.h b/sfw/core/projection.h
similarity index 100%
rename from sfw/projection.h
rename to sfw/core/projection.h
diff --git a/sfw/quaternion.cpp b/sfw/core/quaternion.cpp
similarity index 100%
rename from sfw/quaternion.cpp
rename to sfw/core/quaternion.cpp
diff --git a/sfw/quaternion.h b/sfw/core/quaternion.h
similarity index 100%
rename from sfw/quaternion.h
rename to sfw/core/quaternion.h
diff --git a/sfw/queue.h b/sfw/core/queue.h
similarity index 100%
rename from sfw/queue.h
rename to sfw/core/queue.h
diff --git a/sfw/random_pcg.cpp b/sfw/core/random_pcg.cpp
similarity index 100%
rename from sfw/random_pcg.cpp
rename to sfw/core/random_pcg.cpp
diff --git a/sfw/random_pcg.h b/sfw/core/random_pcg.h
similarity index 100%
rename from sfw/random_pcg.h
rename to sfw/core/random_pcg.h
diff --git a/sfw/rb_map.h b/sfw/core/rb_map.h
similarity index 100%
rename from sfw/rb_map.h
rename to sfw/core/rb_map.h
diff --git a/sfw/rb_set.h b/sfw/core/rb_set.h
similarity index 100%
rename from sfw/rb_set.h
rename to sfw/core/rb_set.h
diff --git a/sfw/rect2.cpp b/sfw/core/rect2.cpp
similarity index 100%
rename from sfw/rect2.cpp
rename to sfw/core/rect2.cpp
diff --git a/sfw/rect2.h b/sfw/core/rect2.h
similarity index 100%
rename from sfw/rect2.h
rename to sfw/core/rect2.h
diff --git a/sfw/rect2i.cpp b/sfw/core/rect2i.cpp
similarity index 100%
rename from sfw/rect2i.cpp
rename to sfw/core/rect2i.cpp
diff --git a/sfw/rect2i.h b/sfw/core/rect2i.h
similarity index 100%
rename from sfw/rect2i.h
rename to sfw/core/rect2i.h
diff --git a/sfw/ring_buffer.h b/sfw/core/ring_buffer.h
similarity index 100%
rename from sfw/ring_buffer.h
rename to sfw/core/ring_buffer.h
diff --git a/sfw/rvector.h b/sfw/core/rvector.h
similarity index 100%
rename from sfw/rvector.h
rename to sfw/core/rvector.h
diff --git a/sfw/rw_lock.h b/sfw/core/rw_lock.h
similarity index 100%
rename from sfw/rw_lock.h
rename to sfw/core/rw_lock.h
diff --git a/sfw/safe_refcount.cpp b/sfw/core/safe_refcount.cpp
similarity index 100%
rename from sfw/safe_refcount.cpp
rename to sfw/core/safe_refcount.cpp
diff --git a/sfw/safe_refcount.h b/sfw/core/safe_refcount.h
similarity index 100%
rename from sfw/safe_refcount.h
rename to sfw/core/safe_refcount.h
diff --git a/sfw/sort_array.h b/sfw/core/sort_array.h
similarity index 100%
rename from sfw/sort_array.h
rename to sfw/core/sort_array.h
diff --git a/sfw/stime.cpp b/sfw/core/stime.cpp
similarity index 100%
rename from sfw/stime.cpp
rename to sfw/core/stime.cpp
diff --git a/sfw/stime.h b/sfw/core/stime.h
similarity index 100%
rename from sfw/stime.h
rename to sfw/core/stime.h
diff --git a/sfw/tight_local_vector.h b/sfw/core/tight_local_vector.h
similarity index 100%
rename from sfw/tight_local_vector.h
rename to sfw/core/tight_local_vector.h
diff --git a/sfw/transform.cpp b/sfw/core/transform.cpp
similarity index 100%
rename from sfw/transform.cpp
rename to sfw/core/transform.cpp
diff --git a/sfw/transform.h b/sfw/core/transform.h
similarity index 100%
rename from sfw/transform.h
rename to sfw/core/transform.h
diff --git a/sfw/transform_2d.cpp b/sfw/core/transform_2d.cpp
similarity index 100%
rename from sfw/transform_2d.cpp
rename to sfw/core/transform_2d.cpp
diff --git a/sfw/transform_2d.h b/sfw/core/transform_2d.h
similarity index 100%
rename from sfw/transform_2d.h
rename to sfw/core/transform_2d.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/ucaps.h b/sfw/core/ucaps.h
similarity index 100%
rename from sfw/ucaps.h
rename to sfw/core/ucaps.h
diff --git a/sfw/ustring.cpp b/sfw/core/ustring.cpp
similarity index 100%
rename from sfw/ustring.cpp
rename to sfw/core/ustring.cpp
diff --git a/sfw/ustring.h b/sfw/core/ustring.h
similarity index 100%
rename from sfw/ustring.h
rename to sfw/core/ustring.h
diff --git a/sfw/vector.h b/sfw/core/vector.h
similarity index 100%
rename from sfw/vector.h
rename to sfw/core/vector.h
diff --git a/sfw/vector2.cpp b/sfw/core/vector2.cpp
similarity index 100%
rename from sfw/vector2.cpp
rename to sfw/core/vector2.cpp
diff --git a/sfw/vector2.h b/sfw/core/vector2.h
similarity index 100%
rename from sfw/vector2.h
rename to sfw/core/vector2.h
diff --git a/sfw/vector2i.cpp b/sfw/core/vector2i.cpp
similarity index 100%
rename from sfw/vector2i.cpp
rename to sfw/core/vector2i.cpp
diff --git a/sfw/vector2i.h b/sfw/core/vector2i.h
similarity index 100%
rename from sfw/vector2i.h
rename to sfw/core/vector2i.h
diff --git a/sfw/vector3.cpp b/sfw/core/vector3.cpp
similarity index 100%
rename from sfw/vector3.cpp
rename to sfw/core/vector3.cpp
diff --git a/sfw/vector3.h b/sfw/core/vector3.h
similarity index 100%
rename from sfw/vector3.h
rename to sfw/core/vector3.h
diff --git a/sfw/vector3i.cpp b/sfw/core/vector3i.cpp
similarity index 100%
rename from sfw/vector3i.cpp
rename to sfw/core/vector3i.cpp
diff --git a/sfw/vector3i.h b/sfw/core/vector3i.h
similarity index 100%
rename from sfw/vector3i.h
rename to sfw/core/vector3i.h
diff --git a/sfw/vector4.cpp b/sfw/core/vector4.cpp
similarity index 100%
rename from sfw/vector4.cpp
rename to sfw/core/vector4.cpp
diff --git a/sfw/vector4.h b/sfw/core/vector4.h
similarity index 100%
rename from sfw/vector4.h
rename to sfw/core/vector4.h
diff --git a/sfw/vector4i.cpp b/sfw/core/vector4i.cpp
similarity index 100%
rename from sfw/vector4i.cpp
rename to sfw/core/vector4i.cpp
diff --git a/sfw/vector4i.h b/sfw/core/vector4i.h
similarity index 100%
rename from sfw/vector4i.h
rename to sfw/core/vector4i.h
diff --git a/sfw/vmap.h b/sfw/core/vmap.h
similarity index 100%
rename from sfw/vmap.h
rename to sfw/core/vmap.h
diff --git a/sfw/vset.h b/sfw/core/vset.h
similarity index 100%
rename from sfw/vset.h
rename to sfw/core/vset.h