diff --git a/src/aliases/aliases.h b/src/common/aliases/aliases.h
similarity index 100%
rename from src/aliases/aliases.h
rename to src/common/aliases/aliases.h
diff --git a/src/misc/misc_utils.h b/src/common/misc/misc_utils.h
similarity index 100%
rename from src/misc/misc_utils.h
rename to src/common/misc/misc_utils.h
diff --git a/src/platform/platform.h b/src/common/platform/platform.h
similarity index 100%
rename from src/platform/platform.h
rename to src/common/platform/platform.h
diff --git a/src/termcolour/termcolour.c b/src/common/termcolour/termcolour.c
similarity index 100%
rename from src/termcolour/termcolour.c
rename to src/common/termcolour/termcolour.c
diff --git a/src/termcolour/termcolour.h b/src/common/termcolour/termcolour.h
similarity index 100%
rename from src/termcolour/termcolour.h
rename to src/common/termcolour/termcolour.h
diff --git a/src/cpath/cpath.c b/src/core/cpath/cpath.c
similarity index 100%
rename from src/cpath/cpath.c
rename to src/core/cpath/cpath.c
diff --git a/src/cpath/cpath.h b/src/core/cpath/cpath.h
similarity index 100%
rename from src/cpath/cpath.h
rename to src/core/cpath/cpath.h
diff --git a/src/mem/arena/mem_arena.c b/src/core/mem/arena/mem_arena.c
similarity index 100%
rename from src/mem/arena/mem_arena.c
rename to src/core/mem/arena/mem_arena.c
diff --git a/src/mem/arena/mem_arena.h b/src/core/mem/arena/mem_arena.h
similarity index 100%
rename from src/mem/arena/mem_arena.h
rename to src/core/mem/arena/mem_arena.h
diff --git a/src/mem/util/mem_utils.c b/src/core/mem/util/mem_utils.c
similarity index 100%
rename from src/mem/util/mem_utils.c
rename to src/core/mem/util/mem_utils.c
diff --git a/src/mem/util/mem_utils.h b/src/core/mem/util/mem_utils.h
similarity index 100%
rename from src/mem/util/mem_utils.h
rename to src/core/mem/util/mem_utils.h
diff --git a/src/strings/basic_strings/basic_strings.h b/src/core/strings/basic_strings/basic_strings.h
similarity index 100%
rename from src/strings/basic_strings/basic_strings.h
rename to src/core/strings/basic_strings/basic_strings.h
diff --git a/src/strings/dstr/dstr.c b/src/core/strings/dstr/dstr.c
similarity index 100%
rename from src/strings/dstr/dstr.c
rename to src/core/strings/dstr/dstr.c
diff --git a/src/strings/dstr/dstr.h b/src/core/strings/dstr/dstr.h
similarity index 100%
rename from src/strings/dstr/dstr.h
rename to src/core/strings/dstr/dstr.h