Restructure the library layers

2025-12-16 17:36:50 +00:00
parent c0d901d7e9
commit 4b95a681d4
55 changed files with 161 additions and 161 deletions
--- a/src/primitives/array/array.c
+++ b/src/primitives/array/array.c
@@ -2,7 +2,7 @@

 #include "./array.h"
 #include "../../common/assert/assert.h"
-#include "../mem_allocator/mem_allocator.h"
+#include "../mem/allocator/mem_allocator.h"
 #include "../../common/misc/misc_utils.h"
 #include "../../common/aliases/aliases.h"
 #include <stddef.h>
--- a/src/primitives/array/array.h
+++ b/src/primitives/array/array.h
@@ -3,7 +3,7 @@
 #ifndef ARRAY_H
 #define ARRAY_H

-#include "../mem_allocator/mem_allocator.h"
+#include "../mem/allocator/mem_allocator.h"
 #include "../../common/misc/misc_utils.h"
 #include "../../common/aliases/aliases.h"
 #include "../../common/platform/platform.h"
--- a/src/primitives/dbl_list/dbl_list.c
+++ b/src/primitives/dbl_list/dbl_list.c
--- a/src/primitives/dbl_list/dbl_list.h
+++ b/src/primitives/dbl_list/dbl_list.h
--- a/src/primitives/mem_allocator/mem_allocator.c
+++ b/src/primitives/mem_allocator/mem_allocator.c
@@ -1,8 +1,8 @@
 // vim:fileencoding=utf-8:foldmethod=marker

 #include "mem_allocator.h"
-#include "../../common/aliases/aliases.h"
-#include "../../common/assert/assert.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/assert/assert.h"
 #include <stdlib.h>

 void *wapp_mem_allocator_alloc(const Allocator *allocator, u64 size) {
--- a/src/primitives/mem_allocator/mem_allocator.h
+++ b/src/primitives/mem_allocator/mem_allocator.h
@@ -3,8 +3,8 @@
 #ifndef MEM_ALLOCATOR_H
 #define MEM_ALLOCATOR_H

-#include "../../common/aliases/aliases.h"
-#include "../../common/platform/platform.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/platform/platform.h"
 #include <string.h>

 #ifdef WAPP_PLATFORM_CPP
--- a/src/base/mem/utils/mem_utils.c
+++ b/src/base/mem/utils/mem_utils.c
--- a/src/base/mem/utils/mem_utils.h
+++ b/src/base/mem/utils/mem_utils.h
--- a/src/primitives/strings/str8/str8.c
+++ b/src/primitives/strings/str8/str8.c
@@ -2,9 +2,9 @@

 #include "str8.h"
 #include "../../array/array.h"
+#include "../../mem/allocator/mem_allocator.h"
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/assert/assert.h"
-#include "../../mem_allocator/mem_allocator.h"
 #include <ctype.h>
 #include <stdarg.h>
 #include <stddef.h>
--- a/src/primitives/strings/str8/str8.h
+++ b/src/primitives/strings/str8/str8.h
@@ -6,9 +6,9 @@
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/assert/assert.h"
 #include "../../../common/platform/platform.h"
-#include "../../../primitives/array/array.h"
-#include "../../../primitives/dbl_list/dbl_list.h"
-#include "../../mem_allocator/mem_allocator.h"
+#include "../../array/array.h"
+#include "../../dbl_list/dbl_list.h"
+#include "../../mem/allocator/mem_allocator.h"
 #include <string.h>

 #ifdef WAPP_PLATFORM_CPP
--- a/src/base/wapp_base.c
+++ b/src/base/wapp_base.c
@@ -0,0 +1,13 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef WAPP_BASE_C
+#define WAPP_BASE_C
+
+#include "wapp_base.h"
+#include "array/array.c"
+#include "dbl_list/dbl_list.c"
+#include "mem/allocator/mem_allocator.c"
+#include "mem/utils/mem_utils.c"
+#include "strings/str8/str8.c"
+
+#endif // !WAPP_BASE_C
--- a/src/primitives/wapp_primitives.h
+++ b/src/primitives/wapp_primitives.h
@@ -1,12 +1,13 @@
 // vim:fileencoding=utf-8:foldmethod=marker

-#ifndef WAPP_PRIMITIVES_H
-#define WAPP_PRIMITIVES_H
+#ifndef WAPP_BASE_H
+#define WAPP_BASE_H

 #include "dbl_list/dbl_list.h"
 #include "array/array.h"
-#include "mem_allocator/mem_allocator.h"
+#include "mem/allocator/mem_allocator.h"
+#include "mem/utils/mem_utils.h"
 #include "strings/str8/str8.h"
 #include "../common/wapp_common.h"

-#endif // !WAPP_PRIMITIVES_H
+#endif // !WAPP_BASE_H
--- a/src/core/wapp_core.c
+++ b/src/core/wapp_core.c
@@ -1,23 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_CORE_C
-#define WAPP_CORE_C
-
-#include "wapp_core.h"
-#include "file/file.c"
-#include "os/shell/termcolour/posix/termcolour_posix.c"
-#include "os/shell/termcolour/win/termcolour_win.c"
-#include "os/shell/termcolour/termcolour.c"
-#include "os/shell/commander/posix/commander_posix.c"
-#include "os/shell/commander/win/commander_win.c"
-#include "os/shell/commander/commander.c"
-#include "os/cpath/cpath.c"
-#include "os/mem/posix/mem_os_posix.c"
-#include "os/mem/win/mem_os_win.c"
-#include "os/mem/mem_os.c"
-#include "mem/utils/mem_utils.c"
-#include "mem/arena/mem_arena.c"
-#include "mem/arena/mem_arena_allocator.c"
-#include "../primitives/wapp_primitives.c"
-
-#endif // !WAPP_CORE_C
--- a/src/core/wapp_core.h
+++ b/src/core/wapp_core.h
@@ -1,23 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_CORE_H
-#define WAPP_CORE_H
-
-#include "file/file.h"
-#include "os/shell/termcolour/termcolour.h"
-#include "os/shell/termcolour/terminal_colours.h"
-#include "os/shell/commander/commander.h"
-#include "os/shell/commander/commander_output.h"
-#include "os/shell/utils/shell_utils.h"
-#include "os/cpath/cpath.h"
-#include "os/mem/posix/mem_os_posix.h"
-#include "os/mem/win/mem_os_win.h"
-#include "os/mem/mem_os_ops.h"
-#include "os/mem/mem_os.h"
-#include "mem/utils/mem_utils.h"
-#include "mem/arena/mem_arena_allocator.h"
-#include "mem/arena/mem_arena.h"
-#include "../common/wapp_common.h"
-#include "../primitives/wapp_primitives.h"
-
-#endif // !WAPP_CORE_H
--- a/src/os/allocators/arena/mem_arena.c
+++ b/src/os/allocators/arena/mem_arena.c
@@ -1,11 +1,11 @@
 // vim:fileencoding=utf-8:foldmethod=marker

 #include "mem_arena.h"
-#include "../utils/mem_utils.h"
+#include "../../mem/mem_os.h"
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/assert/assert.h"
 #include "../../../common/misc/misc_utils.h"
-#include "../../os/mem/mem_os.h"
+#include "../../../base/mem/utils/mem_utils.h"
 #include <stdlib.h>
 #include <string.h>

--- a/src/os/allocators/arena/mem_arena.h
+++ b/src/os/allocators/arena/mem_arena.h
@@ -3,9 +3,9 @@
 #ifndef MEM_ARENA_H
 #define MEM_ARENA_H

+#include "../../mem/mem_os.h"
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/platform/platform.h"
-#include "../../os/mem/mem_os.h"

 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
--- a/src/os/allocators/arena/mem_arena_allocator.c
+++ b/src/os/allocators/arena/mem_arena_allocator.c
@@ -2,8 +2,8 @@

 #include "mem_arena_allocator.h"
 #include "mem_arena.h"
+#include "../../mem/mem_os.h"
 #include "../../../common/aliases/aliases.h"
-#include "../../os/mem/mem_os.h"

 wapp_intern inline void *mem_arena_alloc(u64 size, void *alloc_obj);
 wapp_intern inline void *mem_arena_alloc_aligned(u64 size, u64 alignment, void *alloc_obj);
--- a/src/os/allocators/arena/mem_arena_allocator.h
+++ b/src/os/allocators/arena/mem_arena_allocator.h
@@ -3,10 +3,10 @@
 #ifndef MEM_ARENA_ALLOCATOR_H
 #define MEM_ARENA_ALLOCATOR_H

+#include "../../mem/mem_os.h"
 #include "../../../common/aliases/aliases.h"
 #include "../../../common/platform/platform.h"
-#include "../../../primitives/mem_allocator/mem_allocator.h"
-#include "../../os/mem/mem_os.h"
+#include "../../../base/mem/allocator/mem_allocator.h"

 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
--- a/src/core/os/cpath/cpath.c
+++ b/src/core/os/cpath/cpath.c
@@ -1,12 +1,12 @@
 // vim:fileencoding=utf-8:foldmethod=marker

 #include "cpath.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/misc/misc_utils.h"
-#include "../../mem/arena/mem_arena_allocator.h"
-#include "../../../primitives/dbl_list/dbl_list.h"
-#include "../../../primitives/mem_allocator/mem_allocator.h"
-#include "../../../primitives/strings/str8/str8.h"
+#include "../allocators/arena/mem_arena_allocator.h"
+#include "../../common/aliases/aliases.h"
+#include "../../common/misc/misc_utils.h"
+#include "../../base/dbl_list/dbl_list.h"
+#include "../../base/mem/allocator/mem_allocator.h"
+#include "../../base/strings/str8/str8.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
--- a/src/core/os/cpath/cpath.h
+++ b/src/core/os/cpath/cpath.h
@@ -3,10 +3,10 @@
 #ifndef CPATH_H
 #define CPATH_H

-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
-#include "../../../primitives/mem_allocator/mem_allocator.h"
-#include "../../../primitives/strings/str8/str8.h"
+#include "../../common/aliases/aliases.h"
+#include "../../common/platform/platform.h"
+#include "../../base/mem/allocator/mem_allocator.h"
+#include "../../base/strings/str8/str8.h"

 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
--- a/src/core/file/file.c
+++ b/src/core/file/file.c
@@ -1,11 +1,11 @@
 // vim:fileencoding=utf-8:foldmethod=marker

 #include "file.h"
-#include "../os/cpath/cpath.h"
+#include "../cpath/cpath.h"
 #include "../../common/assert/assert.h"
 #include "../../common/aliases/aliases.h"
-#include "../../primitives/array/array.h"
-#include "../../primitives/strings/str8/str8.h"
+#include "../../base/array/array.h"
+#include "../../base/strings/str8/str8.h"
 #include <stdio.h>

 File *wapp_file_open(Str8RO *filepath, FileAccessMode mode) {
--- a/src/core/file/file.h
+++ b/src/core/file/file.h
@@ -4,7 +4,7 @@
 #define FILE_H

 #include "../../common/aliases/aliases.h"
-#include "../../primitives/strings/str8/str8.h"
+#include "../../base/strings/str8/str8.h"
 #include <stdio.h>

 #ifdef WAPP_PLATFORM_CPP
--- a/src/core/os/mem/mem_os.c
+++ b/src/core/os/mem/mem_os.c
@@ -2,8 +2,8 @@

 #include "mem_os.h"
 #include "mem_os_ops.h"
-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
+#include "../../common/aliases/aliases.h"
+#include "../../common/platform/platform.h"
 #include <assert.h>
 #include <string.h>

--- a/src/core/os/mem/mem_os.h
+++ b/src/core/os/mem/mem_os.h
@@ -3,8 +3,8 @@
 #ifndef MEM_OS_H
 #define MEM_OS_H

-#include "../../../common/aliases/aliases.h"
-#include "../../../common/platform/platform.h"
+#include "../../common/aliases/aliases.h"
+#include "../../common/platform/platform.h"

 #include "mem_os_ops.h"

--- a/src/core/os/mem/mem_os_ops.h
+++ b/src/core/os/mem/mem_os_ops.h
@@ -3,7 +3,7 @@
 #ifndef MEM_OS_OPS_H
 #define MEM_OS_OPS_H

-#include "../../../common/platform/platform.h"
+#include "../../common/platform/platform.h"

 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
--- a/src/core/os/mem/posix/mem_os_posix.c
+++ b/src/core/os/mem/posix/mem_os_posix.c
@@ -1,7 +1,7 @@
 // vim:fileencoding=utf-8:foldmethod=marker

-#include "../../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/platform/platform.h"

 #ifdef WAPP_PLATFORM_POSIX

--- a/src/core/os/mem/posix/mem_os_posix.h
+++ b/src/core/os/mem/posix/mem_os_posix.h
@@ -3,7 +3,7 @@
 #ifndef MEM_OS_POSIX_H
 #define MEM_OS_POSIX_H

-#include "../../../../common/platform/platform.h"
+#include "../../../common/platform/platform.h"

 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
--- a/src/core/os/mem/win/mem_os_win.c
+++ b/src/core/os/mem/win/mem_os_win.c
@@ -1,7 +1,7 @@
 // vim:fileencoding=utf-8:foldmethod=marker

-#include "../../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/platform/platform.h"

 #ifdef WAPP_PLATFORM_WINDOWS

--- a/src/core/os/mem/win/mem_os_win.h
+++ b/src/core/os/mem/win/mem_os_win.h
@@ -3,7 +3,7 @@
 #ifndef MEM_OS_WIN_H
 #define MEM_OS_WIN_H

-#include "../../../../common/platform/platform.h"
+#include "../../../common/platform/platform.h"

 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
--- a/src/core/os/shell/commander/commander.c
+++ b/src/core/os/shell/commander/commander.c
@@ -3,12 +3,12 @@
 #include "commander.h"
 #include "commander_output.h"
 #include "../utils/shell_utils.h"
-#include "../../../mem/arena/mem_arena_allocator.h"
-#include "../../../../common/aliases/aliases.h"
-#include "../../../../common/misc/misc_utils.h"
-#include "../../../../primitives/dbl_list/dbl_list.h"
-#include "../../../../primitives/mem_allocator/mem_allocator.h"
-#include "../../../../primitives/strings/str8/str8.h"
+#include "../../allocators/arena/mem_arena_allocator.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/misc/misc_utils.h"
+#include "../../../base/dbl_list/dbl_list.h"
+#include "../../../base/mem/allocator/mem_allocator.h"
+#include "../../../base/strings/str8/str8.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/src/core/os/shell/commander/commander.h
+++ b/src/core/os/shell/commander/commander.h
@@ -4,9 +4,9 @@
 #define COMMANDER_H

 #include "commander_output.h"
-#include "../../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
-#include "../../../../primitives/strings/str8/str8.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/platform/platform.h"
+#include "../../../base/strings/str8/str8.h"
 #include <stdio.h>
 #include <stdlib.h>

--- a/src/core/os/shell/commander/commander_output.h
+++ b/src/core/os/shell/commander/commander_output.h
@@ -3,8 +3,8 @@
 #ifndef COMMANDER_OUTPUT_H
 #define COMMANDER_OUTPUT_H

-#include "../../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/platform/platform.h"

 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
--- a/src/core/os/shell/commander/posix/commander_posix.c
+++ b/src/core/os/shell/commander/posix/commander_posix.c
@@ -1,7 +1,7 @@
 // vim:fileencoding=utf-8:foldmethod=marker

-#include "../../../../../common/aliases/aliases.h"
-#include "../../../../../common/platform/platform.h"
+#include "../../../../common/aliases/aliases.h"
+#include "../../../../common/platform/platform.h"

 #ifdef WAPP_PLATFORM_POSIX

--- a/src/core/os/shell/commander/win/commander_win.c
+++ b/src/core/os/shell/commander/win/commander_win.c
@@ -1,7 +1,7 @@
 // vim:fileencoding=utf-8:foldmethod=marker

-#include "../../../../../common/aliases/aliases.h"
-#include "../../../../../common/platform/platform.h"
+#include "../../../../common/aliases/aliases.h"
+#include "../../../../common/platform/platform.h"

 #ifdef WAPP_PLATFORM_WINDOWS

--- a/src/core/os/shell/termcolour/posix/termcolour_posix.c
+++ b/src/core/os/shell/termcolour/posix/termcolour_posix.c
@@ -1,8 +1,8 @@
 // vim:fileencoding=utf-8:foldmethod=marker

-#include "../../../../../common/aliases/aliases.h"
-#include "../../../../../common/platform/platform.h"
-#include "../../../../../primitives/strings/str8/str8.h"
+#include "../../../../common/aliases/aliases.h"
+#include "../../../../common/platform/platform.h"
+#include "../../../../base/strings/str8/str8.h"

 #ifdef WAPP_PLATFORM_POSIX

--- a/src/core/os/shell/termcolour/termcolour.c
+++ b/src/core/os/shell/termcolour/termcolour.c
@@ -2,7 +2,7 @@

 #include "termcolour.h"
 #include "terminal_colours.h"
-#include "../../../../primitives/strings/str8/str8.h"
+#include "../../../base/strings/str8/str8.h"

 void wapp_shell_termcolour_print_text(Str8RO *text, TerminalColour colour) {
  if (colour < WAPP_TERM_COLOUR_FG_BLACK || colour > WAPP_TERM_COLOUR_FG_BR_WHITE) {
--- a/src/core/os/shell/termcolour/termcolour.h
+++ b/src/core/os/shell/termcolour/termcolour.h
@@ -4,9 +4,9 @@
 #define TERM_COLOUR_H

 #include "terminal_colours.h"
-#include "../../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
-#include "../../../../primitives/strings/str8/str8.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/platform/platform.h"
+#include "../../../base/strings/str8/str8.h"

 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
--- a/src/core/os/shell/termcolour/terminal_colours.h
+++ b/src/core/os/shell/termcolour/terminal_colours.h
@@ -3,8 +3,8 @@
 #ifndef TERMINAL_COLOURS_H
 #define TERMINAL_COLOURS_H

-#include "../../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/platform/platform.h"

 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
--- a/src/core/os/shell/termcolour/win/termcolour_win.c
+++ b/src/core/os/shell/termcolour/win/termcolour_win.c
@@ -1,8 +1,8 @@
 // vim:fileencoding=utf-8:foldmethod=marker

-#include "../../../../../common/aliases/aliases.h"
-#include "../../../../../common/platform/platform.h"
-#include "../../../../../primitives/strings/str8/str8.h"
+#include "../../../../common/aliases/aliases.h"
+#include "../../../../common/platform/platform.h"
+#include "../../../../base/strings/str8/str8.h"

 #ifdef WAPP_PLATFORM_WINDOWS

--- a/src/core/os/shell/utils/shell_utils.h
+++ b/src/core/os/shell/utils/shell_utils.h
@@ -3,8 +3,8 @@
 #ifndef SHELL_UTILS_H
 #define SHELL_UTILS_H

-#include "../../../../common/aliases/aliases.h"
-#include "../../../../common/platform/platform.h"
+#include "../../../common/aliases/aliases.h"
+#include "../../../common/platform/platform.h"
 #include <stdio.h>

 #ifdef WAPP_PLATFORM_CPP
--- a/src/os/wapp_os.c
+++ b/src/os/wapp_os.c
@@ -0,0 +1,22 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef WAPP_OS_C
+#define WAPP_OS_C
+
+#include "wapp_os.h"
+#include "file/file.c"
+#include "shell/termcolour/posix/termcolour_posix.c"
+#include "shell/termcolour/win/termcolour_win.c"
+#include "shell/termcolour/termcolour.c"
+#include "shell/commander/posix/commander_posix.c"
+#include "shell/commander/win/commander_win.c"
+#include "shell/commander/commander.c"
+#include "cpath/cpath.c"
+#include "allocators/arena/mem_arena.c"
+#include "allocators/arena/mem_arena_allocator.c"
+#include "mem/posix/mem_os_posix.c"
+#include "mem/win/mem_os_win.c"
+#include "mem/mem_os.c"
+#include "../base/wapp_base.c"
+
+#endif // !WAPP_OS_C
--- a/src/os/wapp_os.h
+++ b/src/os/wapp_os.h
@@ -0,0 +1,22 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef WAPP_CORE_H
+#define WAPP_CORE_H
+
+#include "file/file.h"
+#include "shell/termcolour/termcolour.h"
+#include "shell/termcolour/terminal_colours.h"
+#include "shell/commander/commander.h"
+#include "shell/commander/commander_output.h"
+#include "shell/utils/shell_utils.h"
+#include "cpath/cpath.h"
+#include "allocators/arena/mem_arena.h"
+#include "allocators/arena/mem_arena_allocator.h"
+#include "mem/posix/mem_os_posix.h"
+#include "mem/win/mem_os_win.h"
+#include "mem/mem_os_ops.h"
+#include "mem/mem_os.h"
+#include "../common/wapp_common.h"
+#include "../base/wapp_base.h"
+
+#endif // !WAPP_CORE_H
--- a/src/primitives/wapp_primitives.c
+++ b/src/primitives/wapp_primitives.c
@@ -1,12 +0,0 @@
-// vim:fileencoding=utf-8:foldmethod=marker
-
-#ifndef WAPP_PRIMITIVES_C
-#define WAPP_PRIMITIVES_C
-
-#include "wapp_primitives.h"
-#include "array/array.c"
-#include "dbl_list/dbl_list.c"
-#include "mem_allocator/mem_allocator.c"
-#include "strings/str8/str8.c"
-
-#endif // !WAPP_PRIMITIVES_C
--- a/src/testing/tester/tester.c
+++ b/src/testing/tester/tester.c
@@ -2,8 +2,8 @@

 #include "tester.h"
 #include "../../common/aliases/aliases.h"
-#include "../../core/os/shell/termcolour/termcolour.h"
-#include "../../primitives/strings/str8/str8.h"
+#include "../../os/shell/termcolour/termcolour.h"
+#include "../../base/strings/str8/str8.h"
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/src/testing/tester/tester.h
+++ b/src/testing/tester/tester.h
@@ -5,7 +5,7 @@

 #include "../../common/misc/misc_utils.h"
 #include "../../common/platform/platform.h"
-#include "../../primitives/strings/str8/str8.h"
+#include "../../base/strings/str8/str8.h"

 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
--- a/src/testing/wapp_testing.c
+++ b/src/testing/wapp_testing.c
@@ -5,6 +5,6 @@

 #include "wapp_testing.h"
 #include "tester/tester.c"
-#include "../core/wapp_core.c"
+#include "../os/wapp_os.c"

 #endif // !WAPP_TESTING_C
--- a/src/testing/wapp_testing.h
+++ b/src/testing/wapp_testing.h
@@ -5,6 +5,6 @@

 #include "tester/tester.h"
 #include "../common/wapp_common.h"
-#include "../core/wapp_core.h"
+#include "../os/wapp_os.h"

 #endif // !WAPP_TESTING_H
--- a/src/uuid/uuid.c
+++ b/src/uuid/uuid.c
@@ -3,7 +3,7 @@
 #include "uuid.h"
 #include "../common/aliases/aliases.h"
 #include "../common/assert/assert.h"
-#include "../primitives/strings/str8/str8.h"
+#include "../base/strings/str8/str8.h"
 #include "../prng/xorshift/xorshift.h"
 #include <inttypes.h>

--- a/src/uuid/uuid.h
+++ b/src/uuid/uuid.h
@@ -5,7 +5,7 @@

 #include "../common/aliases/aliases.h"
 #include "../common/platform/platform.h"
-#include "../primitives/strings/str8/str8.h"
+#include "../base/strings/str8/str8.h"

 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
--- a/src/uuid/wapp_uuid.c
+++ b/src/uuid/wapp_uuid.c
@@ -4,7 +4,7 @@
 #define WAPP_UUID_C

 #include "uuid.c"
-#include "../primitives/wapp_primitives.c"
+#include "../base/wapp_base.c"
 #include "../prng/wapp_prng.c"

 #endif // !WAPP_UUID_C
--- a/src/uuid/wapp_uuid.h
+++ b/src/uuid/wapp_uuid.h
@@ -5,7 +5,7 @@

 #include "uuid.h"
 #include "../common/wapp_common.h"
-#include "../primitives/wapp_primitives.h"
+#include "../base/wapp_base.h"
 #include "../prng/wapp_prng.h"

 #endif // !WAPP_UUID_H
--- a/src/wapp.c
+++ b/src/wapp.c
@@ -4,8 +4,8 @@
 #define WAPP_C

 #include "wapp.h"
-#include "primitives/wapp_primitives.c"
-#include "core/wapp_core.c"
+#include "base/wapp_base.c"
+#include "os/wapp_os.c"
 #include "prng/wapp_prng.c"
 #include "uuid/uuid.c"
 #include "testing/wapp_testing.c"
--- a/src/wapp.h
+++ b/src/wapp.h
@@ -4,8 +4,8 @@
 #define WAPP_H

 #include "common/wapp_common.h"
-#include "primitives/wapp_primitives.h"
-#include "core/wapp_core.h"
+#include "base/wapp_base.h"
+#include "os/wapp_os.h"
 #include "prng/wapp_prng.h"
 #include "uuid/wapp_uuid.h"
 #include "testing/wapp_testing.h"