diff --git a/assets/asset_builder/.ccls b/asset_builder/.ccls
similarity index 100%
rename from assets/asset_builder/.ccls
rename to asset_builder/.ccls
diff --git a/asset_builder/Makefile b/asset_builder/Makefile
new file mode 100644
index 0000000..fe1ef8b
--- /dev/null
+++ b/asset_builder/Makefile
@@ -0,0 +1,30 @@
+SOURCES := \
+  object.c \
+  image.c \
+  map.c \
+  utils.c \
+  main.c
+
+INCLUDES += \
+  $(ASSET_BUILDER_DIR) \
+  $(SOURCE_DIR)/components
+
+OBJECTS := $(SOURCES:%=$(BUILD_DIR)/$(notdir $(ASSET_BUILDER_DIR))/%.o)
+
+ifeq ($(TOTAL_BUILD_FILES),)
+TOTAL_BUILD_FILES := $(shell echo $$(($$($(MAKE) -n $(OBJECTS) TOTAL_BUILD_FILES=1 2>/dev/null | grep -c Building) + 1)))
+endif
+
+$(ASSET_BUILDER_OUTPUT): $(OBJECTS)
+	$(Q)mkdir -p $(dir $@)
+	@echo -e "[100%] $(YELLOW)Linking $(notdir $(ASSET_BUILDER_OUTPUT))$(RESET)"
+	$(Q)$(ASSET_BUILDER_CC) $(ASSET_BUILDER_CFLAGS) $(ASSET_BUILDER_LDFLAGS) $(OBJECTS) -o $@
+
+$(BUILD_DIR)/$(notdir $(ASSET_BUILDER_DIR))/%.o: $(ASSET_BUILDER_DIR)/%
+	$(Q)mkdir -p $(dir $@)
+	$(eval CURRENT_FILE := $(shell echo $$(($(CURRENT_FILE)+1))))
+	$(eval PERCENTAGE := $(shell echo $$(($(CURRENT_FILE)*100/$(TOTAL_BUILD_FILES)))))
+	@echo -e "[$(PERCENTAGE)%] $(GREEN)Building C object $@$(RESET)"
+	$(Q)$(ASSET_BUILDER_CC) $(ASSET_BUILDER_CFLAGS) $(INCLUDES:%=-I%) -MMD -MP -c $< -o $@
+
+-include $(ASSET_BUILDER_OBJECTS:.o=.d)
diff --git a/assets/asset_builder/README.md b/asset_builder/README.md
similarity index 100%
rename from assets/asset_builder/README.md
rename to asset_builder/README.md
diff --git a/assets/asset_builder/errors.h b/asset_builder/errors.h
similarity index 100%
rename from assets/asset_builder/errors.h
rename to asset_builder/errors.h
diff --git a/assets/asset_builder/image.c b/asset_builder/image.c
similarity index 100%
rename from assets/asset_builder/image.c
rename to asset_builder/image.c
diff --git a/assets/asset_builder/image.h b/asset_builder/image.h
similarity index 100%
rename from assets/asset_builder/image.h
rename to asset_builder/image.h
diff --git a/assets/asset_builder/main.c b/asset_builder/main.c
similarity index 100%
rename from assets/asset_builder/main.c
rename to asset_builder/main.c
diff --git a/assets/asset_builder/map.c b/asset_builder/map.c
similarity index 100%
rename from assets/asset_builder/map.c
rename to asset_builder/map.c
diff --git a/assets/asset_builder/map.h b/asset_builder/map.h
similarity index 100%
rename from assets/asset_builder/map.h
rename to asset_builder/map.h
diff --git a/assets/asset_builder/object.c b/asset_builder/object.c
similarity index 100%
rename from assets/asset_builder/object.c
rename to asset_builder/object.c
diff --git a/assets/asset_builder/object.h b/asset_builder/object.h
similarity index 100%
rename from assets/asset_builder/object.h
rename to asset_builder/object.h
diff --git a/assets/asset_builder/utils.c b/asset_builder/utils.c
similarity index 100%
rename from assets/asset_builder/utils.c
rename to asset_builder/utils.c
diff --git a/assets/asset_builder/utils.h b/asset_builder/utils.h
similarity index 100%
rename from assets/asset_builder/utils.h
rename to asset_builder/utils.h
diff --git a/assets/asset_builder/Makefile b/assets/asset_builder/Makefile
deleted file mode 100644
index ce36c4e..0000000
--- a/assets/asset_builder/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# Source files
-ASSET_BUILDER_SOURCES := \
-  object.c \
-  image.c \
-  map.c \
-  utils.c \
-  main.c
-
-# Compiler and flags
-ASSET_BUILDER_CC = gcc
-ifeq ($(RELEASE), 1)
-ASSET_BUILDER_CFLAGS = --std=c17 --pedantic -O3 $(shell pkg-config --cflags libpng json-c) # RELEASE
-
-ASSET_BUILDER_LDFLAGS = -O3 $(shell pkg-config --libs libpng json-c)
-else
-ASSET_BUILDER_CFLAGS = --std=c17 --pedantic -O1 -DDEBUG=1 -g $(shell pkg-config --cflags libpng json-c) \
-	-Wall -Wno-missing-braces -Wextra -Wno-missing-field-initializers \
-    -Wformat=2 -Wswitch-default -Wswitch -Wcast-align \
-    -Wpointer-arith -Wbad-function-cast -Wstrict-overflow=5 \
-    -Wstrict-prototypes -Winline -Wundef -Wnested-externs \
-    -Wcast-qual -Wshadow -Wunreachable-code -Wlogical-op \
-    -Wfloat-equal -Wstrict-aliasing=2 -Wredundant-decls \
-    -Wold-style-definition # DEVELOPEMENT
-
-ASSET_BUILDER_LDFLAGS = -O1 $(shell pkg-config --libs libpng json-c)
-endif
-
-ASSET_BUILDER_INCLUDE_DIRS = $(SOURCE_DIR)/components $(ASSET_BUILDER_DIR)
-ASSET_BUILDER_INCLUDE_DIRS := $(addprefix -I, $(ASSET_BUILDER_INCLUDE_DIRS))
-
-# Deduce objects
-ASSET_BUILDER_OBJECTS = $(ASSET_BUILDER_SOURCES:%.c=$(BUILD_DIR)/$(ASSET_BUILDER_DIR)/%.o)
-
-# Current file nb to process
-CURRENT_ASSET_BUILDER_FILE := 0
-
-# Build asset builder target
-build_asset_builder: asset_builder_setup count_asset_builder_build asset_builder_end
-
-# Source build directories
-asset_builder_setup:
-	@echo "Building $(notdir $(ASSET_BUILDER_OUTPUT))"
-	$(Q)mkdir -p $(dir $(ASSET_BUILDER_OBJECTS))
-
-# Count nb of files to build
-count_asset_builder_build:
-	$(eval export TOTAL_ASSET_BUILDER_FILES := $(shell echo $$(($$(make -n $(ASSET_BUILDER_OBJECTS) 2>/dev/null | grep -c "Building") + 1))))
-
-# Link asset builder target
-$(ASSET_BUILDER_OUTPUT): $(ASSET_BUILDER_OBJECTS)
-	@echo -e "[100%] $(YELLOW)Linking $(notdir $(ASSET_BUILDER_OUTPUT))$(RESET)"
-	$(Q)$(SRC_CC) $(ASSET_BUILDER_OBJECTS) -o $@ $(ASSET_BUILDER_LDFLAGS)
-
-# Build .o files
-$(BUILD_DIR)/$(ASSET_BUILDER_DIR)/%.o: $(ASSET_BUILDER_DIR)/%.c
-	$(eval CURRENT_ASSET_BUILDER_FILE := $(shell echo $$(($(CURRENT_ASSET_BUILDER_FILE)+1))))
-	$(eval PERCENTAGE := $(shell echo $$(($(CURRENT_ASSET_BUILDER_FILE)*100/$(TOTAL_ASSET_BUILDER_FILES)))))
-	@echo -e "[$(PERCENTAGE)%] $(GREEN)Building C object $@$(RESET)"
-	$(Q)$(SRC_CC) $(ASSET_BUILDER_CFLAGS) $(ASSET_BUILDER_INCLUDE_DIRS) -MMD -MP -c $< -o $@
-
-# Print ending message
-asset_builder_end: $(ASSET_BUILDER_OUTPUT)
-	@echo "Built target $(notdir $(ASSET_BUILDER_OUTPUT))"
-
-# Source files dependencies
--include $(ASSET_BUILDER_OBJECTS:.o=.d)