diff --git a/Makefile b/Makefile
index 584964d..53f63c2 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,8 @@ all: AVRe AVRrc AVRxm AVRxt
 
 build: date Dir $(C_HEADERS) target
 
+variant_build: rebuild manifest
+
 $(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)
 	@echo -e '\033[1;32mCC ('$(ARCH)')\t'$<'\t->\t'$@'\033[0m'
 	@$(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@
@@ -78,14 +80,14 @@ $(MANIFEST_BUILD_DIR)/MANIFEST.json: $(C_HEADERS) $(MANIFEST_TARGETS)
 	done
 
 	@echo -e "\033[1;32mPY\t$@\033[0m"
-	@python $(MANIFEST_SRC_DIR)/gen_manifest_json.py $(MANIFEST_BUILD_DIR)
+	@python3 $(MANIFEST_SRC_DIR)/gen_manifest_json.py $(MANIFEST_BUILD_DIR)
 
 
 
 
 $(MANIFEST_BUILD_DIR)/%.elf: $(MANIFEST_SRC_DIR)/%.c Makefile $(C_HEADERS) | $(MANIFEST_BUILD_DIR)
 	@echo -e '\033[1;32mELF\t'$(OBJECTS)'\n\t\t\t->\t'$@'\033[0m'
-	@$(CC) $(MANIFEST_LFLAGS) $< $(DEFINES) $(LDLIBS) -I inc -o $@
+	@$(CC) $(MANIFEST_LFLAGS) $< $(C_INCLUDES) $(DEFINES) $(LDLIBS) -I inc -o $@
 
 $(BUILD_DIR):
 	@mkdir -p $(BUILD_DIR)
@@ -104,19 +106,19 @@ AVRxt: AVRxt_build/AVRxt.so
 
 AVRe_build/AVRe.so:
 	@echo -e '\033[1;32mMK (AVRe)\033[0m'
-	@$(MAKE) --no-print-directory rebuild ARCH=AVRe BUILD_DIR=AVRe_build
+	@$(MAKE) --no-print-directory variant_build ARCH=AVRe BUILD_DIR=AVRe_build MANIFEST_BUILD_DIR=AVRe_build/manifest
 
 AVRrc_build/AVRrc.so:
 	@echo -e '\033[1;32mMK (AVRrc)\033[0m'
-	@$(MAKE) --no-print-directory rebuild ARCH=AVRrc BUILD_DIR=AVRrc_build
+	@$(MAKE) --no-print-directory variant_build ARCH=AVRrc BUILD_DIR=AVRrc_build MANIFEST_BUILD_DIR=AVRrc_build/manifest
 
 AVRxm_build/AVRxm.so:
 	@echo -e '\033[1;32mMK (AVRxm)\033[0m'
-	@$(MAKE) --no-print-directory rebuild ARCH=AVRxm BUILD_DIR=AVRxm_build
+	@$(MAKE) --no-print-directory variant_build ARCH=AVRxm BUILD_DIR=AVRxm_build MANIFEST_BUILD_DIR=AVRxm_build/manifest
 
 AVRxt_build/AVRxt.so:
 	@echo -e '\033[1;32mMK (AVRxt)\033[0m'
-	@$(MAKE) --no-print-directory rebuild ARCH=AVRxt BUILD_DIR=AVRxt_build
+	@$(MAKE) --no-print-directory variant_build ARCH=AVRxt BUILD_DIR=AVRxt_build MANIFEST_BUILD_DIR=AVRxt_build/manifest
 
 BuildDir:
 	@mkdir -p $(BUILD_DIR)
@@ -136,7 +138,7 @@ clean:
 	@rm -rf AVRe_build AVRrc_build AVRxm_build AVRxt_build
 	@echo -e '\033[0;31mCleaned\033[0m'
 
-.NOTPARALLEL: date target rebuild
+.NOTPARALLEL: date target rebuild variant_build
 date:
 	@echo -e '\033[1;32m'"Starting build at "$(START_AT)'\033[0m'
 
diff --git a/instructions.json b/manifest_src/instructions.json
similarity index 100%
rename from instructions.json
rename to manifest_src/instructions.json