diff --git a/base/project.js b/base/project.js
index 59ae7a21..364c9ea7 100644
--- a/base/project.js
+++ b/base/project.js
@@ -22,7 +22,7 @@ if (platform != "wasm") {
 	project.add_cfiles("sources/libs/gc.c");
 }
 
-project.add_cfiles("sources/libs/kong/dir.c");
+project.add_cfiles("sources/kong/dir.c");
 project.add_define("EMBED_H_PATH=\"" + os_cwd() + "/build/embed.h" +
                    "\"");
 
@@ -122,8 +122,8 @@ else if (platform == "wasm") {
 	project.add_define("IRON_WASM");
 	project.add_define("IRON_WEBGPU");
 	project.add_define("NO_GC");
-	project.add_cfiles("sources/libs/miniclib/**");
-	project.add_include_dir("sources/libs/miniclib");
+	project.add_cfiles("sources/miniclib/**");
+	project.add_include_dir("sources/miniclib");
 	project.add_assets("sources/backends/data/wasm/*");
 }
 
@@ -133,9 +133,9 @@ if (graphics == "metal" || (graphics == "vulkan" && platform != "android")) {
 
 if (flags.with_kong) {
 	project.add_define("WITH_KONG");
-	project.add_cfiles("sources/libs/kong/libs/*.c");
-	project.add_cfiles("sources/libs/kong/*.c");
-	project.add_cfiles("sources/libs/kong/backends/*.c");
+	project.add_cfiles("sources/kong/libs/*.c");
+	project.add_cfiles("sources/kong/*.c");
+	project.add_cfiles("sources/kong/backends/*.c");
 }
 
 if (flags.with_plugins) {
diff --git a/base/sources/engine.c b/base/sources/engine.c
index def1dbb8..fe4c8ba4 100644
--- a/base/sources/engine.c
+++ b/base/sources/engine.c
@@ -308,7 +308,7 @@ world_data_t *world_data_parse(char *name, char *id) {
 		char *base = substring(raw->radiance, 0, dot);
 
 		for (i32 i = 0; i < raw->radiance_mipmaps; ++i) {
-			char          *mip_name             = string_join(string_join(base, string_join("_", i32_to_string(i))), ext);
+			char          *mip_name             = string("%s_%s%s", base, i32_to_string(i), ext);
 			gpu_texture_t *mipimg               = data_get_image(mip_name);
 			raw->_->radiance_mipmaps->buffer[i] = mipimg;
 		}
@@ -345,7 +345,7 @@ f32_array_t *world_data_set_irradiance(world_data_t *raw) {
 	if (raw->irradiance == NULL) {
 		return world_data_get_empty_irradiance();
 	}
-	buffer_t     *b                 = data_get_blob(string_join(raw->irradiance, ".arm"));
+	buffer_t     *b                 = data_get_blob(string("%s.arm", raw->irradiance));
 	irradiance_t *irradiance_parsed = (irradiance_t *)armpack_decode(b);
 	f32_array_t  *irr               = f32_array_create(28); // Align to mult of 4 - 27->28
 	for (i32 i = 0; i < 27; ++i) {
@@ -581,9 +581,9 @@ void shader_context_compile(shader_context_t *raw) {
 		raw->_->pipe->fragment_shader = sys_get_shader(raw->fragment_shader);
 		raw->_->pipe->vertex_shader   = sys_get_shader(raw->vertex_shader);
 #else
-		buffer_t *vs_buffer           = data_get_blob(string_join(raw->vertex_shader, shader_data_ext()));
+		buffer_t *vs_buffer           = data_get_blob(string("%s%s", raw->vertex_shader, shader_data_ext()));
 		raw->_->pipe->vertex_shader   = gpu_create_shader(vs_buffer, GPU_SHADER_TYPE_VERTEX);
-		buffer_t *fs_buffer           = data_get_blob(string_join(raw->fragment_shader, shader_data_ext()));
+		buffer_t *fs_buffer           = data_get_blob(string("%s%s", raw->fragment_shader, shader_data_ext()));
 		raw->_->pipe->fragment_shader = gpu_create_shader(fs_buffer, GPU_SHADER_TYPE_FRAGMENT);
 #endif
 	}
@@ -1892,7 +1892,7 @@ char *data_resolve_path(char *file) {
 	if (data_is_abs(file) || data_is_up(file)) {
 		return file;
 	}
-	return string_join(data_path(), file);
+	return string("%s%s", data_path(), file);
 }
 
 mesh_data_t *data_get_mesh(char *file, char *name) {
@@ -1900,7 +1900,7 @@ mesh_data_t *data_get_mesh(char *file, char *name) {
 		data_cached_meshes = any_map_create();
 		gc_root(data_cached_meshes);
 	}
-	char        *handle = string_join(file, name);
+	char        *handle = string("%s%s", file, name);
 	mesh_data_t *cached = (mesh_data_t *)any_map_get(data_cached_meshes, handle);
 	if (cached != NULL) {
 		return cached;
@@ -1916,7 +1916,7 @@ camera_data_t *data_get_camera(char *file, char *name) {
 		data_cached_cameras = any_map_create();
 		gc_root(data_cached_cameras);
 	}
-	char          *handle = string_join(file, name);
+	char          *handle = string("%s%s", file, name);
 	camera_data_t *cached = (camera_data_t *)any_map_get(data_cached_cameras, handle);
 	if (cached != NULL) {
 		return cached;
@@ -1931,7 +1931,7 @@ material_data_t *data_get_material(char *file, char *name) {
 		data_cached_materials = any_map_create();
 		gc_root(data_cached_materials);
 	}
-	char            *handle = string_join(file, name);
+	char            *handle = string("%s%s", file, name);
 	material_data_t *cached = (material_data_t *)any_map_get(data_cached_materials, handle);
 	if (cached != NULL) {
 		return cached;
@@ -1946,7 +1946,7 @@ world_data_t *data_get_world(char *file, char *name) {
 		data_cached_worlds = any_map_create();
 		gc_root(data_cached_worlds);
 	}
-	char         *handle = string_join(file, name);
+	char         *handle = string("%s%s", file, name);
 	world_data_t *cached = (world_data_t *)any_map_get(data_cached_worlds, handle);
 	if (cached != NULL) {
 		return cached;
@@ -1983,7 +1983,7 @@ scene_t *data_get_scene_raw(char *file) {
 	}
 	// If no extension specified, set to .arm
 	char     *ext    = ends_with(file, ".arm") ? "" : ".arm";
-	buffer_t *b      = data_get_blob(string_join(file, ext));
+	buffer_t *b      = data_get_blob(string("%s%s", file, ext));
 	scene_t  *parsed = (scene_t *)armpack_decode(b);
 	any_map_set(data_cached_scene_raws, file, parsed);
 	return parsed;
@@ -2029,7 +2029,7 @@ video_t *data_get_video(char *file) {
 	}
 	// Strip extension and use .webm
 	char    *base   = substring(file, 0, string_length(file) - 4);
-	char    *webm   = string_join(base, ".webm");
+	char    *webm   = string("%s.webm", base);
 	video_t *cached = (video_t *)any_map_get(data_cached_videos, webm);
 	if (cached != NULL) {
 		return cached;
diff --git a/base/sources/iron_file.c b/base/sources/iron_file.c
index 81475c1e..92498189 100644
--- a/base/sources/iron_file.c
+++ b/base/sources/iron_file.c
@@ -7,7 +7,7 @@
 #include "iron_path.h"
 #include "iron_string.h"
 #include "iron_system.h"
-#include "libs/kong/dir.h"
+#include "kong/dir.h"
 #ifdef IRON_ANDROID
 #include <backends/android_system.h>
 #endif
@@ -628,7 +628,7 @@ void file_cache_cloud(char *path, void (*done)(char *dest), char *server) {
 #ifdef IRON_WINDOWS
 	path = string_replace_all(path, "\\", "/");
 #endif
-	char *url = string_join(string_join(server, "/"), path);
+	char *url = string("%s/%s", server, path);
 
 	file_cache_cloud_data_t *fccd = malloc(sizeof(file_cache_cloud_data_t));
 	strcpy(fccd->dest, dest);
@@ -697,13 +697,13 @@ static void _file_init_cloud_index_callback(char *url, buffer_t *buffer) {}
 
 void file_init_cloud_bytes(void (*done)(void), char *append, char *server) {
 	_file_init_cloud_bytes_done = done;
-	char *index_url             = string_join(string_join(server, "/index.txt"), append != NULL ? append : "");
+	char *index_url             = string("%s/index.txt%s", server, append != NULL ? append : "");
 	iron_file_download(index_url, _file_init_cloud_bytes_callback, 0, NULL);
 	iron_file_download("https://cloud-index.armory3d.workers.dev/", _file_init_cloud_index_callback, 0, NULL);
 }
 
 void file_init_cloud(void (*done)(void), char *server) {
-	file_cloud       = any_map_create();
+	file_cloud = any_map_create();
 	gc_root(file_cloud);
 	file_cloud_sizes = i32_map_create();
 	gc_root(file_cloud_sizes);
diff --git a/base/sources/iron_json.c b/base/sources/iron_json.c
index 748cd8d4..a168fc97 100644
--- a/base/sources/iron_json.c
+++ b/base/sources/iron_json.c
@@ -324,24 +324,20 @@ void json_encode_begin() {
 }
 
 char *json_encode_end() {
-	encoded = string_join(encoded, "}");
+	encoded = string("%s}", encoded);
 	return encoded;
 }
 
 void json_encode_key(char *k) {
 	if (keys > 0) {
-		encoded = string_join(encoded, ",");
+		encoded = string("%s,", encoded);
 	}
-	encoded = string_join(encoded, "\"");
-	encoded = string_join(encoded, k);
-	encoded = string_join(encoded, "\":");
+	encoded = string("%s\"%s\":", encoded, k);
 	keys++;
 }
 
 void json_encode_string_value(char *v) {
-	encoded = string_join(encoded, "\"");
-	encoded = string_join(encoded, v);
-	encoded = string_join(encoded, "\"");
+	encoded = string("%s\"%s\"", encoded, v);
 }
 
 void json_encode_string(char *k, char *v) {
@@ -353,7 +349,7 @@ void json_encode_string_array(char *k, char_ptr_array_t *a) {
 	json_encode_begin_array(k);
 	for (uint32_t i = 0; i < a->length; ++i) {
 		if (i > 0) {
-			encoded = string_join(encoded, ",");
+			encoded = string("%s,", encoded);
 		}
 		json_encode_string_value(a->buffer[i]);
 	}
@@ -362,26 +358,26 @@ void json_encode_string_array(char *k, char_ptr_array_t *a) {
 
 void json_encode_f32(char *k, float f) {
 	json_encode_key(k);
-	encoded = string_join(encoded, f32_to_string_with_zeros(f));
+	encoded = string("%s%s", encoded, f32_to_string_with_zeros(f));
 }
 
 void json_encode_i32(char *k, int i) {
 	json_encode_key(k);
-	encoded = string_join(encoded, i32_to_string(i));
+	encoded = string("%s%s", encoded, i32_to_string(i));
 }
 
 void json_encode_null(char *k) {
 	json_encode_key(k);
-	encoded = string_join(encoded, "null");
+	encoded = string("%snull", encoded);
 }
 
 void json_encode_f32_array(char *k, f32_array_t *a) {
 	json_encode_begin_array(k);
 	for (uint32_t i = 0; i < a->length; ++i) {
 		if (i > 0) {
-			encoded = string_join(encoded, ",");
+			encoded = string("%s,", encoded);
 		}
-		encoded = string_join(encoded, f32_to_string_with_zeros(a->buffer[i]));
+		encoded = string("%s%s", encoded, f32_to_string_with_zeros(a->buffer[i]));
 	}
 	json_encode_end_array();
 }
@@ -390,43 +386,43 @@ void json_encode_i32_array(char *k, i32_array_t *a) {
 	json_encode_begin_array(k);
 	for (uint32_t i = 0; i < a->length; ++i) {
 		if (i > 0) {
-			encoded = string_join(encoded, ",");
+			encoded = string("%s,", encoded);
 		}
-		encoded = string_join(encoded, i32_to_string(a->buffer[i]));
+		encoded = string("%s%s", encoded, i32_to_string(a->buffer[i]));
 	}
 	json_encode_end_array();
 }
 
 void json_encode_bool(char *k, bool b) {
 	json_encode_key(k);
-	encoded = string_join(encoded, b ? "true" : "false");
+	encoded = string("%s%s", encoded, b ? "true" : "false");
 }
 
 void json_encode_begin_array(char *k) {
 	array_nest++;
 	array_length[array_nest] = 0;
 	json_encode_key(k);
-	encoded = string_join(encoded, "[");
+	encoded = string("%s[", encoded);
 }
 
 void json_encode_end_array() {
 	array_nest--;
-	encoded = string_join(encoded, "]");
+	encoded = string("%s]", encoded);
 }
 
 void json_encode_begin_object() {
 	if (array_nest > -1) {
 		if (array_length[array_nest] > 0) {
-			encoded = string_join(encoded, ",");
+			encoded = string("%s,", encoded);
 		}
 		array_length[array_nest]++;
 	}
 	keys    = 0;
-	encoded = string_join(encoded, "{");
+	encoded = string("%s{", encoded);
 }
 
 void json_encode_end_object() {
-	encoded = string_join(encoded, "}");
+	encoded = string("%s}", encoded);
 }
 
 void json_encode_map(any_map_t *m) {
diff --git a/base/sources/iron_path.c b/base/sources/iron_path.c
index bbc3c2d6..911b5011 100644
--- a/base/sources/iron_path.c
+++ b/base/sources/iron_path.c
@@ -4,9 +4,9 @@
 
 #include "iron_array.h"
 #include "iron_file.h"
+#include "iron_gc.h"
 #include "iron_map.h"
 #include "iron_string.h"
-#include "iron_gc.h"
 
 #ifdef IRON_LINUX
 bool path_is_protected_linux = false;
@@ -25,7 +25,7 @@ static char_ptr_array_t *_path_displacement_ext = NULL;
 char_ptr_array_t *path_mesh_formats(void) {
 	if (_path_mesh_formats == NULL) {
 		_path_mesh_formats = char_ptr_array_create(0);
-        gc_root(_path_mesh_formats);
+		gc_root(_path_mesh_formats);
 		char_ptr_array_push(_path_mesh_formats, "obj");
 		char_ptr_array_push(_path_mesh_formats, "blend");
 	}
@@ -35,7 +35,7 @@ char_ptr_array_t *path_mesh_formats(void) {
 char_ptr_array_t *path_texture_formats(void) {
 	if (_path_texture_formats == NULL) {
 		_path_texture_formats = char_ptr_array_create(0);
-        gc_root(_path_texture_formats);
+		gc_root(_path_texture_formats);
 		char_ptr_array_push(_path_texture_formats, "jpg");
 		char_ptr_array_push(_path_texture_formats, "jpeg");
 		char_ptr_array_push(_path_texture_formats, "png");
@@ -52,7 +52,7 @@ char_ptr_array_t *path_texture_formats(void) {
 char_ptr_array_t *path_base_color_ext(void) {
 	if (_path_base_color_ext == NULL) {
 		_path_base_color_ext = char_ptr_array_create(0);
-        gc_root(_path_base_color_ext);
+		gc_root(_path_base_color_ext);
 		char_ptr_array_push(_path_base_color_ext, "albedo");
 		char_ptr_array_push(_path_base_color_ext, "alb");
 		char_ptr_array_push(_path_base_color_ext, "basecol");
@@ -71,7 +71,7 @@ char_ptr_array_t *path_base_color_ext(void) {
 char_ptr_array_t *path_opacity_ext(void) {
 	if (_path_opacity_ext == NULL) {
 		_path_opacity_ext = char_ptr_array_create(0);
-        gc_root(_path_opacity_ext);
+		gc_root(_path_opacity_ext);
 		char_ptr_array_push(_path_opacity_ext, "opac");
 		char_ptr_array_push(_path_opacity_ext, "opacity");
 		char_ptr_array_push(_path_opacity_ext, "alpha");
@@ -82,7 +82,7 @@ char_ptr_array_t *path_opacity_ext(void) {
 char_ptr_array_t *path_normal_map_ext(void) {
 	if (_path_normal_map_ext == NULL) {
 		_path_normal_map_ext = char_ptr_array_create(0);
-        gc_root(_path_normal_map_ext);
+		gc_root(_path_normal_map_ext);
 		char_ptr_array_push(_path_normal_map_ext, "normal");
 		char_ptr_array_push(_path_normal_map_ext, "normals");
 		char_ptr_array_push(_path_normal_map_ext, "nor");
@@ -96,7 +96,7 @@ char_ptr_array_t *path_normal_map_ext(void) {
 char_ptr_array_t *path_occlusion_ext(void) {
 	if (_path_occlusion_ext == NULL) {
 		_path_occlusion_ext = char_ptr_array_create(0);
-        gc_root(_path_occlusion_ext);
+		gc_root(_path_occlusion_ext);
 		char_ptr_array_push(_path_occlusion_ext, "ao");
 		char_ptr_array_push(_path_occlusion_ext, "occlusion");
 		char_ptr_array_push(_path_occlusion_ext, "ambientOcclusion");
@@ -109,7 +109,7 @@ char_ptr_array_t *path_occlusion_ext(void) {
 char_ptr_array_t *path_roughness_ext(void) {
 	if (_path_roughness_ext == NULL) {
 		_path_roughness_ext = char_ptr_array_create(0);
-        gc_root(_path_roughness_ext);
+		gc_root(_path_roughness_ext);
 		char_ptr_array_push(_path_roughness_ext, "roughness");
 		char_ptr_array_push(_path_roughness_ext, "rough");
 		char_ptr_array_push(_path_roughness_ext, "r");
@@ -121,7 +121,7 @@ char_ptr_array_t *path_roughness_ext(void) {
 char_ptr_array_t *path_metallic_ext(void) {
 	if (_path_metallic_ext == NULL) {
 		_path_metallic_ext = char_ptr_array_create(0);
-        gc_root(_path_metallic_ext);
+		gc_root(_path_metallic_ext);
 		char_ptr_array_push(_path_metallic_ext, "metallic");
 		char_ptr_array_push(_path_metallic_ext, "metal");
 		char_ptr_array_push(_path_metallic_ext, "metalness");
@@ -134,7 +134,7 @@ char_ptr_array_t *path_metallic_ext(void) {
 char_ptr_array_t *path_displacement_ext(void) {
 	if (_path_displacement_ext == NULL) {
 		_path_displacement_ext = char_ptr_array_create(0);
-        gc_root(_path_displacement_ext);
+		gc_root(_path_displacement_ext);
 		char_ptr_array_push(_path_displacement_ext, "displacement");
 		char_ptr_array_push(_path_displacement_ext, "height");
 		char_ptr_array_push(_path_displacement_ext, "h");
@@ -152,7 +152,7 @@ static char *data_path(void) {
 }
 
 char *path_data(void) {
-	return string_join(iron_internal_files_location(), string_join(PATH_SEP, data_path()));
+	return string("%s%s%s", iron_internal_files_location(), PATH_SEP, data_path());
 }
 
 char *path_to_relative(char *from, char *to) {
@@ -171,9 +171,9 @@ char *path_to_relative(char *from, char *to) {
 	}
 	char *p = "";
 	for (uint32_t i = 0; i < a->length; ++i) {
-		p = string_join(p, ".." PATH_SEP);
+		p = string("%s.." PATH_SEP, p);
 	}
-	p = string_join(p, string_array_join(b, PATH_SEP));
+	p = string("%s%s", p, string_array_join(b, PATH_SEP));
 	return p;
 }
 
@@ -219,7 +219,7 @@ bool path_is_mesh(char *path) {
 	char_ptr_array_t *formats = path_mesh_formats();
 	for (uint32_t i = 0; i < formats->length; ++i) {
 		char *s   = formats->buffer[i];
-		char *ext = string_join(".", s);
+		char *ext = string(".%s", s);
 		if (ends_with(p, ext)) {
 			return true;
 		}
@@ -232,7 +232,7 @@ bool path_is_texture(char *path) {
 	char_ptr_array_t *formats = path_texture_formats();
 	for (uint32_t i = 0; i < formats->length; ++i) {
 		char *s   = formats->buffer[i];
-		char *ext = string_join(".", s);
+		char *ext = string(".%s", s);
 		if (ends_with(p, ext)) {
 			return true;
 		}
@@ -284,11 +284,11 @@ bool path_check_ext(char *p, char_ptr_array_t *exts) {
 	p = string_replace_all(p, "-", "_");
 	for (uint32_t i = 0; i < exts->length; ++i) {
 		char *ext            = exts->buffer[i];
-		char *ext_underscore = string_join("_", ext);
+		char *ext_underscore = string("_%s", ext);
 		if (ends_with(p, ext_underscore)) {
 			return true;
 		}
-		char *ext_underscore_mid = string_join("_", string_join(ext, "_"));
+		char *ext_underscore_mid = string("_%s_", ext);
 		if (string_index_of(p, ext_underscore_mid) >= 0 && !ends_with(p, "_preview") && !ends_with(p, "_icon")) {
 			return true;
 		}
@@ -348,8 +348,8 @@ bool path_is_protected(void) {
 char *path_join(char *a, char *b) {
 	char *path = a;
 	if (!ends_with(path, PATH_SEP)) {
-		path = string_join(path, PATH_SEP);
+		path = string("%s" PATH_SEP, path);
 	}
-	path = string_join(path, b);
+	path = string("%s%s", path, b);
 	return path;
 }
diff --git a/base/sources/iron_string.c b/base/sources/iron_string.c
index 84490e04..653b0c05 100644
--- a/base/sources/iron_string.c
+++ b/base/sources/iron_string.c
@@ -30,13 +30,6 @@ char *string(char *fmt, ...) {
     return str;
 }
 
-char *string_join(char *a, char *b) {
-	char *r = string_alloc(strlen(a) + strlen(b) + 1);
-	strcpy(r, a);
-	strcat(r, b);
-	return r;
-}
-
 char *string_copy(char *a) {
 	if (a == NULL) {
 		return NULL;
diff --git a/base/sources/iron_string.h b/base/sources/iron_string.h
index bc42df4a..ac31fa78 100644
--- a/base/sources/iron_string.h
+++ b/base/sources/iron_string.h
@@ -7,7 +7,6 @@
 
 char *string_alloc(int size);
 char *string(char *fmt, ...);
-char *string_join(char *a, char *b);
 char *string_copy(char *a);
 int   string_length(char *str);
 bool  string_equals(char *a, char *b);
diff --git a/base/sources/libs/kong/analyzer.c b/base/sources/kong/analyzer.c
similarity index 100%
rename from base/sources/libs/kong/analyzer.c
rename to base/sources/kong/analyzer.c
diff --git a/base/sources/libs/kong/analyzer.h b/base/sources/kong/analyzer.h
similarity index 100%
rename from base/sources/libs/kong/analyzer.h
rename to base/sources/kong/analyzer.h
diff --git a/base/sources/libs/kong/api.h b/base/sources/kong/api.h
similarity index 100%
rename from base/sources/libs/kong/api.h
rename to base/sources/kong/api.h
diff --git a/base/sources/libs/kong/array.h b/base/sources/kong/array.h
similarity index 100%
rename from base/sources/libs/kong/array.h
rename to base/sources/kong/array.h
diff --git a/base/sources/libs/kong/backends/cstyle.c b/base/sources/kong/backends/cstyle.c
similarity index 100%
rename from base/sources/libs/kong/backends/cstyle.c
rename to base/sources/kong/backends/cstyle.c
diff --git a/base/sources/libs/kong/backends/cstyle.h b/base/sources/kong/backends/cstyle.h
similarity index 100%
rename from base/sources/libs/kong/backends/cstyle.h
rename to base/sources/kong/backends/cstyle.h
diff --git a/base/sources/libs/kong/backends/d3d11.c b/base/sources/kong/backends/d3d11.c
similarity index 100%
rename from base/sources/libs/kong/backends/d3d11.c
rename to base/sources/kong/backends/d3d11.c
diff --git a/base/sources/libs/kong/backends/d3d11.h b/base/sources/kong/backends/d3d11.h
similarity index 100%
rename from base/sources/libs/kong/backends/d3d11.h
rename to base/sources/kong/backends/d3d11.h
diff --git a/base/sources/libs/kong/backends/d3d12.cpp b/base/sources/kong/backends/d3d12.cpp
similarity index 100%
rename from base/sources/libs/kong/backends/d3d12.cpp
rename to base/sources/kong/backends/d3d12.cpp
diff --git a/base/sources/libs/kong/backends/d3d12.h b/base/sources/kong/backends/d3d12.h
similarity index 100%
rename from base/sources/libs/kong/backends/d3d12.h
rename to base/sources/kong/backends/d3d12.h
diff --git a/base/sources/libs/kong/backends/hlsl.c b/base/sources/kong/backends/hlsl.c
similarity index 100%
rename from base/sources/libs/kong/backends/hlsl.c
rename to base/sources/kong/backends/hlsl.c
diff --git a/base/sources/libs/kong/backends/hlsl.h b/base/sources/kong/backends/hlsl.h
similarity index 100%
rename from base/sources/libs/kong/backends/hlsl.h
rename to base/sources/kong/backends/hlsl.h
diff --git a/base/sources/libs/kong/backends/metal.c b/base/sources/kong/backends/metal.c
similarity index 100%
rename from base/sources/libs/kong/backends/metal.c
rename to base/sources/kong/backends/metal.c
diff --git a/base/sources/libs/kong/backends/metal.h b/base/sources/kong/backends/metal.h
similarity index 100%
rename from base/sources/libs/kong/backends/metal.h
rename to base/sources/kong/backends/metal.h
diff --git a/base/sources/libs/kong/backends/spirv.c b/base/sources/kong/backends/spirv.c
similarity index 100%
rename from base/sources/libs/kong/backends/spirv.c
rename to base/sources/kong/backends/spirv.c
diff --git a/base/sources/libs/kong/backends/spirv.h b/base/sources/kong/backends/spirv.h
similarity index 100%
rename from base/sources/libs/kong/backends/spirv.h
rename to base/sources/kong/backends/spirv.h
diff --git a/base/sources/libs/kong/backends/util.c b/base/sources/kong/backends/util.c
similarity index 100%
rename from base/sources/libs/kong/backends/util.c
rename to base/sources/kong/backends/util.c
diff --git a/base/sources/libs/kong/backends/util.h b/base/sources/kong/backends/util.h
similarity index 100%
rename from base/sources/libs/kong/backends/util.h
rename to base/sources/kong/backends/util.h
diff --git a/base/sources/libs/kong/backends/wgsl.c b/base/sources/kong/backends/wgsl.c
similarity index 100%
rename from base/sources/libs/kong/backends/wgsl.c
rename to base/sources/kong/backends/wgsl.c
diff --git a/base/sources/libs/kong/backends/wgsl.h b/base/sources/kong/backends/wgsl.h
similarity index 100%
rename from base/sources/libs/kong/backends/wgsl.h
rename to base/sources/kong/backends/wgsl.h
diff --git a/base/sources/libs/kong/compiler.c b/base/sources/kong/compiler.c
similarity index 100%
rename from base/sources/libs/kong/compiler.c
rename to base/sources/kong/compiler.c
diff --git a/base/sources/libs/kong/compiler.h b/base/sources/kong/compiler.h
similarity index 100%
rename from base/sources/libs/kong/compiler.h
rename to base/sources/kong/compiler.h
diff --git a/base/sources/libs/kong/dir.c b/base/sources/kong/dir.c
similarity index 100%
rename from base/sources/libs/kong/dir.c
rename to base/sources/kong/dir.c
diff --git a/base/sources/libs/kong/dir.h b/base/sources/kong/dir.h
similarity index 100%
rename from base/sources/libs/kong/dir.h
rename to base/sources/kong/dir.h
diff --git a/base/sources/libs/kong/disasm.c b/base/sources/kong/disasm.c
similarity index 100%
rename from base/sources/libs/kong/disasm.c
rename to base/sources/kong/disasm.c
diff --git a/base/sources/libs/kong/disasm.h b/base/sources/kong/disasm.h
similarity index 100%
rename from base/sources/libs/kong/disasm.h
rename to base/sources/kong/disasm.h
diff --git a/base/sources/libs/kong/errors.c b/base/sources/kong/errors.c
similarity index 100%
rename from base/sources/libs/kong/errors.c
rename to base/sources/kong/errors.c
diff --git a/base/sources/libs/kong/errors.h b/base/sources/kong/errors.h
similarity index 100%
rename from base/sources/libs/kong/errors.h
rename to base/sources/kong/errors.h
diff --git a/base/sources/libs/kong/functions.c b/base/sources/kong/functions.c
similarity index 100%
rename from base/sources/libs/kong/functions.c
rename to base/sources/kong/functions.c
diff --git a/base/sources/libs/kong/functions.h b/base/sources/kong/functions.h
similarity index 100%
rename from base/sources/libs/kong/functions.h
rename to base/sources/kong/functions.h
diff --git a/base/sources/libs/kong/globals.c b/base/sources/kong/globals.c
similarity index 100%
rename from base/sources/libs/kong/globals.c
rename to base/sources/kong/globals.c
diff --git a/base/sources/libs/kong/globals.h b/base/sources/kong/globals.h
similarity index 100%
rename from base/sources/libs/kong/globals.h
rename to base/sources/kong/globals.h
diff --git a/base/sources/libs/kong/hashmap.h b/base/sources/kong/hashmap.h
similarity index 100%
rename from base/sources/libs/kong/hashmap.h
rename to base/sources/kong/hashmap.h
diff --git a/base/sources/libs/kong/kong.c b/base/sources/kong/kong.c
similarity index 100%
rename from base/sources/libs/kong/kong.c
rename to base/sources/kong/kong.c
diff --git a/base/sources/libs/kong/libs/stb_ds.c b/base/sources/kong/libs/stb_ds.c
similarity index 100%
rename from base/sources/libs/kong/libs/stb_ds.c
rename to base/sources/kong/libs/stb_ds.c
diff --git a/base/sources/libs/kong/libs/stb_ds.h b/base/sources/kong/libs/stb_ds.h
similarity index 100%
rename from base/sources/libs/kong/libs/stb_ds.h
rename to base/sources/kong/libs/stb_ds.h
diff --git a/base/sources/libs/kong/log.c b/base/sources/kong/log.c
similarity index 100%
rename from base/sources/libs/kong/log.c
rename to base/sources/kong/log.c
diff --git a/base/sources/libs/kong/log.h b/base/sources/kong/log.h
similarity index 100%
rename from base/sources/libs/kong/log.h
rename to base/sources/kong/log.h
diff --git a/base/sources/libs/kong/mac.plist b/base/sources/kong/mac.plist
similarity index 100%
rename from base/sources/libs/kong/mac.plist
rename to base/sources/kong/mac.plist
diff --git a/base/sources/libs/kong/names.c b/base/sources/kong/names.c
similarity index 100%
rename from base/sources/libs/kong/names.c
rename to base/sources/kong/names.c
diff --git a/base/sources/libs/kong/names.h b/base/sources/kong/names.h
similarity index 100%
rename from base/sources/libs/kong/names.h
rename to base/sources/kong/names.h
diff --git a/base/sources/libs/kong/parser.c b/base/sources/kong/parser.c
similarity index 100%
rename from base/sources/libs/kong/parser.c
rename to base/sources/kong/parser.c
diff --git a/base/sources/libs/kong/parser.h b/base/sources/kong/parser.h
similarity index 100%
rename from base/sources/libs/kong/parser.h
rename to base/sources/kong/parser.h
diff --git a/base/sources/libs/kong/readme.md b/base/sources/kong/readme.md
similarity index 100%
rename from base/sources/libs/kong/readme.md
rename to base/sources/kong/readme.md
diff --git a/base/sources/libs/kong/sets.c b/base/sources/kong/sets.c
similarity index 100%
rename from base/sources/libs/kong/sets.c
rename to base/sources/kong/sets.c
diff --git a/base/sources/libs/kong/sets.h b/base/sources/kong/sets.h
similarity index 100%
rename from base/sources/libs/kong/sets.h
rename to base/sources/kong/sets.h
diff --git a/base/sources/libs/kong/shader_stage.h b/base/sources/kong/shader_stage.h
similarity index 100%
rename from base/sources/libs/kong/shader_stage.h
rename to base/sources/kong/shader_stage.h
diff --git a/base/sources/libs/kong/tokenizer.c b/base/sources/kong/tokenizer.c
similarity index 100%
rename from base/sources/libs/kong/tokenizer.c
rename to base/sources/kong/tokenizer.c
diff --git a/base/sources/libs/kong/tokenizer.h b/base/sources/kong/tokenizer.h
similarity index 100%
rename from base/sources/libs/kong/tokenizer.h
rename to base/sources/kong/tokenizer.h
diff --git a/base/sources/libs/kong/transformer.c b/base/sources/kong/transformer.c
similarity index 100%
rename from base/sources/libs/kong/transformer.c
rename to base/sources/kong/transformer.c
diff --git a/base/sources/libs/kong/transformer.h b/base/sources/kong/transformer.h
similarity index 100%
rename from base/sources/libs/kong/transformer.h
rename to base/sources/kong/transformer.h
diff --git a/base/sources/libs/kong/typer.c b/base/sources/kong/typer.c
similarity index 100%
rename from base/sources/libs/kong/typer.c
rename to base/sources/kong/typer.c
diff --git a/base/sources/libs/kong/typer.h b/base/sources/kong/typer.h
similarity index 100%
rename from base/sources/libs/kong/typer.h
rename to base/sources/kong/typer.h
diff --git a/base/sources/libs/kong/types.c b/base/sources/kong/types.c
similarity index 100%
rename from base/sources/libs/kong/types.c
rename to base/sources/kong/types.c
diff --git a/base/sources/libs/kong/types.h b/base/sources/kong/types.h
similarity index 100%
rename from base/sources/libs/kong/types.h
rename to base/sources/kong/types.h
diff --git a/base/sources/libs/miniclib/assert.h b/base/sources/miniclib/assert.h
similarity index 100%
rename from base/sources/libs/miniclib/assert.h
rename to base/sources/miniclib/assert.h
diff --git a/base/sources/libs/miniclib/ctype.c b/base/sources/miniclib/ctype.c
similarity index 100%
rename from base/sources/libs/miniclib/ctype.c
rename to base/sources/miniclib/ctype.c
diff --git a/base/sources/libs/miniclib/ctype.h b/base/sources/miniclib/ctype.h
similarity index 100%
rename from base/sources/libs/miniclib/ctype.h
rename to base/sources/miniclib/ctype.h
diff --git a/base/sources/libs/miniclib/errno.h b/base/sources/miniclib/errno.h
similarity index 100%
rename from base/sources/libs/miniclib/errno.h
rename to base/sources/miniclib/errno.h
diff --git a/base/sources/libs/miniclib/inttypes.h b/base/sources/miniclib/inttypes.h
similarity index 100%
rename from base/sources/libs/miniclib/inttypes.h
rename to base/sources/miniclib/inttypes.h
diff --git a/base/sources/libs/miniclib/license.txt b/base/sources/miniclib/license.txt
similarity index 100%
rename from base/sources/libs/miniclib/license.txt
rename to base/sources/miniclib/license.txt
diff --git a/base/sources/libs/miniclib/math.c b/base/sources/miniclib/math.c
similarity index 100%
rename from base/sources/libs/miniclib/math.c
rename to base/sources/miniclib/math.c
diff --git a/base/sources/libs/miniclib/math.h b/base/sources/miniclib/math.h
similarity index 100%
rename from base/sources/libs/miniclib/math.h
rename to base/sources/miniclib/math.h
diff --git a/base/sources/libs/miniclib/memory.h b/base/sources/miniclib/memory.h
similarity index 100%
rename from base/sources/libs/miniclib/memory.h
rename to base/sources/miniclib/memory.h
diff --git a/base/sources/libs/miniclib/stdarg.h b/base/sources/miniclib/stdarg.h
similarity index 100%
rename from base/sources/libs/miniclib/stdarg.h
rename to base/sources/miniclib/stdarg.h
diff --git a/base/sources/libs/miniclib/stdbool.h b/base/sources/miniclib/stdbool.h
similarity index 100%
rename from base/sources/libs/miniclib/stdbool.h
rename to base/sources/miniclib/stdbool.h
diff --git a/base/sources/libs/miniclib/stdio.c b/base/sources/miniclib/stdio.c
similarity index 100%
rename from base/sources/libs/miniclib/stdio.c
rename to base/sources/miniclib/stdio.c
diff --git a/base/sources/libs/miniclib/stdio.h b/base/sources/miniclib/stdio.h
similarity index 100%
rename from base/sources/libs/miniclib/stdio.h
rename to base/sources/miniclib/stdio.h
diff --git a/base/sources/libs/miniclib/stdlib.c b/base/sources/miniclib/stdlib.c
similarity index 100%
rename from base/sources/libs/miniclib/stdlib.c
rename to base/sources/miniclib/stdlib.c
diff --git a/base/sources/libs/miniclib/stdlib.h b/base/sources/miniclib/stdlib.h
similarity index 100%
rename from base/sources/libs/miniclib/stdlib.h
rename to base/sources/miniclib/stdlib.h
diff --git a/base/sources/libs/miniclib/string.c b/base/sources/miniclib/string.c
similarity index 100%
rename from base/sources/libs/miniclib/string.c
rename to base/sources/miniclib/string.c
diff --git a/base/sources/libs/miniclib/string.h b/base/sources/miniclib/string.h
similarity index 100%
rename from base/sources/libs/miniclib/string.h
rename to base/sources/miniclib/string.h
diff --git a/base/sources/libs/miniclib/time.h b/base/sources/miniclib/time.h
similarity index 100%
rename from base/sources/libs/miniclib/time.h
rename to base/sources/miniclib/time.h
diff --git a/base/tests/triangle/main.c b/base/tests/triangle/main.c
index 0c919b47..46ee7600 100644
--- a/base/tests/triangle/main.c
+++ b/base/tests/triangle/main.c
@@ -35,8 +35,8 @@ void _kickstart() {
 
 	gpu_vertex_structure_t *vs = GC_ALLOC_INIT(gpu_vertex_structure_t, {0});
 	gpu_vertex_struct_add(vs, "pos", GPU_VERTEX_DATA_F32_3X);
-	buffer_t     *vs_buffer         = iron_load_blob(string_join("./data/test.vert", sys_shader_ext()));
-	buffer_t     *fs_buffer         = iron_load_blob(string_join("./data/test.frag", sys_shader_ext()));
+	buffer_t     *vs_buffer         = iron_load_blob(string("./data/test.vert%s", sys_shader_ext()));
+	buffer_t     *fs_buffer         = iron_load_blob(string("./data/test.frag%s", sys_shader_ext()));
 	gpu_shader_t *vert              = gpu_create_shader(vs_buffer, GPU_SHADER_TYPE_VERTEX);
 	gpu_shader_t *frag              = gpu_create_shader(fs_buffer, GPU_SHADER_TYPE_FRAGMENT);
 	pipeline->vertex_shader         = vert;
@@ -95,8 +95,14 @@ void _kickstart() {
 any_map_t *ui_children;
 any_map_t *ui_nodes_custom_buttons;
 i32        pipes_offset;
-char *strings_check_internet_connection() { return ""; }
+char      *strings_check_internet_connection() {
+    return "";
+}
 void  console_error(char *s) {}
 void  console_info(char *s) {}
-char *tr(char *id, any_map_t *vars) { return id; }
-i32   pipes_get_constant_location(char * s) { return 0; }
+char *tr(char *id, any_map_t *vars) {
+	return id;
+}
+i32 pipes_get_constant_location(char *s) {
+	return 0;
+}
diff --git a/base/tools/amake/ashader.c b/base/tools/amake/ashader.c
index bcc2cc05..a87fd10f 100644
--- a/base/tools/amake/ashader.c
+++ b/base/tools/amake/ashader.c
@@ -7,23 +7,23 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../../sources/libs/kong/analyzer.h"
-#include "../../sources/libs/kong/backends/hlsl.h"
-#include "../../sources/libs/kong/backends/metal.h"
-#include "../../sources/libs/kong/backends/spirv.h"
-#include "../../sources/libs/kong/backends/wgsl.h"
-#include "../../sources/libs/kong/compiler.h"
-#include "../../sources/libs/kong/disasm.h"
-#include "../../sources/libs/kong/errors.h"
-#include "../../sources/libs/kong/functions.h"
-#include "../../sources/libs/kong/globals.h"
-#include "../../sources/libs/kong/log.h"
-#include "../../sources/libs/kong/names.h"
-#include "../../sources/libs/kong/parser.h"
-#include "../../sources/libs/kong/tokenizer.h"
-#include "../../sources/libs/kong/transformer.h"
-#include "../../sources/libs/kong/typer.h"
-#include "../../sources/libs/kong/types.h"
+#include "../../sources/kong/analyzer.h"
+#include "../../sources/kong/backends/hlsl.h"
+#include "../../sources/kong/backends/metal.h"
+#include "../../sources/kong/backends/spirv.h"
+#include "../../sources/kong/backends/wgsl.h"
+#include "../../sources/kong/compiler.h"
+#include "../../sources/kong/disasm.h"
+#include "../../sources/kong/errors.h"
+#include "../../sources/kong/functions.h"
+#include "../../sources/kong/globals.h"
+#include "../../sources/kong/log.h"
+#include "../../sources/kong/names.h"
+#include "../../sources/kong/parser.h"
+#include "../../sources/kong/tokenizer.h"
+#include "../../sources/kong/transformer.h"
+#include "../../sources/kong/typer.h"
+#include "../../sources/kong/types.h"
 
 #ifdef _WIN32
 #include <D3Dcompiler.h>
diff --git a/base/tools/amake/kong/alang.c b/base/tools/amake/kong/alang.c
index 7b5a641c..c0815d90 100644
--- a/base/tools/amake/kong/alang.c
+++ b/base/tools/amake/kong/alang.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 // #define STB_DS_IMPLEMENTATION
-#include "../../sources/libs/kong/libs/stb_ds.h"
+#include "../../sources/kong/libs/stb_ds.h"
 #ifdef WIN32
 #include <Windows.h>
 #endif
diff --git a/base/tools/amake/project.js b/base/tools/amake/project.js
index 3fa5522b..7ec567a4 100644
--- a/base/tools/amake/project.js
+++ b/base/tools/amake/project.js
@@ -16,9 +16,9 @@ project.add_cfiles("main.c");
 project.add_cfiles("aimage.c");
 
 project.add_cfiles("ashader.c");
-project.add_cfiles('../../sources/libs/kong/libs/*.c');
-project.add_cfiles('../../sources/libs/kong/*.c');
-project.add_cfiles('../../sources/libs/kong/backends/*.c');
+project.add_cfiles('../../sources/kong/libs/*.c');
+project.add_cfiles('../../sources/kong/*.c');
+project.add_cfiles('../../sources/kong/backends/*.c');
 
 if (platform === "windows") {
 	project.add_define('_CRT_SECURE_NO_WARNINGS');