diff --git a/fw/SummerCart64.qsf b/fw/SummerCart64.qsf
index 3ed036d..b234d2a 100644
--- a/fw/SummerCart64.qsf
+++ b/fw/SummerCart64.qsf
@@ -19,7 +19,7 @@
 #
 # Quartus Prime
 # Version 20.1.1 Build 720 11/11/2020 SJ Lite Edition
-# Date created = 21:34:30  August 28, 2021
+# Date created = 02:09:23  August 29, 2021
 #
 # -------------------------------------------------------------------------- #
 #
@@ -53,8 +53,8 @@ set_global_assignment -name QIP_FILE rtl/intel/gpio/intel_gpio_ddro.qip
 set_global_assignment -name QIP_FILE rtl/intel/pll/intel_pll.qip
 set_global_assignment -name SDC_FILE SummerCart64.sdc
 set_global_assignment -name SIGNALTAP_FILE stp.stp
-set_global_assignment -name SYSTEMVERILOG_FILE cpu/bootloader/cpu_bootloader.sv
-set_global_assignment -name SYSTEMVERILOG_FILE picorv32/picorv32.v
+set_global_assignment -name SYSTEMVERILOG_FILE cpu/picorv32/picorv32.v
+set_global_assignment -name SYSTEMVERILOG_FILE rtl/cpu/cpu_bootloader.sv
 set_global_assignment -name SYSTEMVERILOG_FILE rtl/cpu/cpu_bus.sv
 set_global_assignment -name SYSTEMVERILOG_FILE rtl/cpu/cpu_cfg.sv
 set_global_assignment -name SYSTEMVERILOG_FILE rtl/cpu/cpu_dma.sv
diff --git a/fw/cpu/bootloader/Makefile b/fw/cpu/bootloader/Makefile
index f59a2e7..6bda14f 100644
--- a/fw/cpu/bootloader/Makefile
+++ b/fw/cpu/bootloader/Makefile
@@ -24,13 +24,13 @@ bootloader.bin: bootloader.elf
 	@$(CROSS)objcopy -O binary bootloader.elf bootloader.bin
 
 cpu_bootloader.sv: bootloader.bin
-	@python3 bin2sv.py bootloader.bin cpu_bootloader_template.sv cpu_bootloader.sv
+	@python3 bin2sv.py bootloader.bin cpu_bootloader_template.sv ../../rtl/cpu/cpu_bootloader.sv
 
 print_size:
 	@echo 'Size of target .elf file:'
 	$(CROSS)size -B bootloader.elf
 
 clean:
-	@rm -f cpu_bootloader.sv bootloader.bin bootloader.elf
+	@rm -f bootloader.bin bootloader.elf
 
 .PHONY: clean
diff --git a/fw/cpu/bootloader/cpu_bootloader.sv b/fw/rtl/cpu/cpu_bootloader.sv
similarity index 100%
rename from fw/cpu/bootloader/cpu_bootloader.sv
rename to fw/rtl/cpu/cpu_bootloader.sv
diff --git a/fw/rtl/cpu/cpu_wrapper.sv b/fw/rtl/cpu/cpu_wrapper.sv
index ed37687..596b5d6 100644
--- a/fw/rtl/cpu/cpu_wrapper.sv
+++ b/fw/rtl/cpu/cpu_wrapper.sv
@@ -31,7 +31,6 @@ module cpu_wrapper (
     picorv32 #(
         .ENABLE_COUNTERS(0),
         .ENABLE_COUNTERS64(0),
-        .TWO_STAGE_SHIFT(0),
         .CATCH_MISALIGN(0),
         .CATCH_ILLINSN(0),
         .PROGADDR_RESET({4'(sc64::ID_CPU_BOOTLOADER), 28'h000_0000})