diff --git a/Makefile b/Makefile
index 7dc67a3..edb1066 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ $(OUT)canboot.elf: $(OBJS_canboot.elf)
 	$(Q)scripts/check-gcc.sh $@ $(OUT)compile_time_request.o
 
 $(OUT)canboot.bin: $(OUT)canboot.elf ./scripts/buildbinary.py
-	@echo "  Creating hex file $@"
+	@echo "  Creating bin file $@"
 	$(Q)$(OBJCOPY) -O binary $< $(OUT)canboot.work
 	$(Q)$(PYTHON) ./scripts/buildbinary.py -b $(CONFIG_FLASH_START) -s $(CONFIG_APPLICATION_START) $(BUILDBINARY_FLAGS) $(OUT)canboot.work -c $(OUT)canboot_payload.c $@
 
diff --git a/src/rp2040/bootrom.h b/lib/rp2040/pico/bootrom/bootrom.h
similarity index 100%
rename from src/rp2040/bootrom.h
rename to lib/rp2040/pico/bootrom/bootrom.h
diff --git a/src/rp2040/hw_flash.c b/lib/rp2040/pico/flash/hw_flash.c
similarity index 100%
rename from src/rp2040/hw_flash.c
rename to lib/rp2040/pico/flash/hw_flash.c
diff --git a/src/rp2040/hw_flash.h b/lib/rp2040/pico/flash/hw_flash.h
similarity index 100%
rename from src/rp2040/hw_flash.h
rename to lib/rp2040/pico/flash/hw_flash.h
diff --git a/lib/rp2040_flash/main.c b/lib/rp2040_flash/main.c
index 1c11195..e938eb3 100644
--- a/lib/rp2040_flash/main.c
+++ b/lib/rp2040_flash/main.c
@@ -174,7 +174,7 @@ int main(int argc, char *argv[]) {
         rc = 1;
         goto do_exit;
     }
-    fprintf(stderr, "Loaded UF2 image with %lu pages\n", image->num_blocks);
+    fprintf(stderr, "Loaded UF2 image with %zu pages\n", image->num_blocks);
 
     bool has_target = false;
     uint8_t target_bus = 0;
diff --git a/scripts/uf2_append_boot_signature.py b/scripts/uf2_append_boot_signature.py
index 4c2c797..320e89c 100755
--- a/scripts/uf2_append_boot_signature.py
+++ b/scripts/uf2_append_boot_signature.py
@@ -12,7 +12,6 @@ def renumerate(content):
        result.extend(block[ : 20])
        result.extend(struct.pack("<II", current, total))
        result.extend(block[ 28 : ])
-#      print("address " + hex(int.from_bytes(block[12:16], "little")))
     return result
 
 def add_signature(content, address):
@@ -42,7 +41,6 @@ def main():
     content = renumerate(content)
     with open(args.output, 'wb') as f:
        f.write(content)
-       f.close()
 
 if __name__ == '__main__':
     main()
diff --git a/src/rp2040/Makefile b/src/rp2040/Makefile
index fa19b94..f2984c1 100644
--- a/src/rp2040/Makefile
+++ b/src/rp2040/Makefile
@@ -3,16 +3,16 @@
 # Setup the toolchain
 CROSS_PREFIX=arm-none-eabi-
 
-dirs-y += src/rp2040 src/generic lib/rp2040/elf2uf2 lib/fast-hash lib/can2040
+dirs-y += src/rp2040 src/generic lib/rp2040/elf2uf2 lib/fast-hash lib/can2040 lib/rp2040/pico/flash/
 
 CFLAGS += -mcpu=cortex-m0plus -mthumb -Ilib/cmsis-core
-CFLAGS += -Ilib/rp2040 -Ilib/rp2040/cmsis_include -Ilib/fast-hash -Ilib/can2040
+CFLAGS += -Ilib/rp2040 -Ilib/rp2040/cmsis_include -Ilib/fast-hash -Ilib/can2040 -Ilib/rp2040/pico/flash/ -Ilib/rp2040/pico/bootrom/
 
 CFLAGS_canboot.elf += --specs=nano.specs --specs=nosys.specs
 CFLAGS_canboot.elf += -T $(OUT)src/rp2040/rp2040_link.ld
 
 # Add source files
-mcu-y  = rp2040/main.c rp2040/gpio.c rp2040/timer.c rp2040/flash.c  rp2040/hw_flash.c
+mcu-y  = rp2040/main.c rp2040/gpio.c rp2040/timer.c rp2040/flash.c  ../lib/rp2040/pico/flash/hw_flash.c
 mcu-y += generic/armcm_irq.c generic/crc16_ccitt.c
 
 src-y += rp2040/armcm_canboot.c $(mcu-y)
@@ -56,7 +56,7 @@ lib/rp2040_flash/rp2040_flash:
 # Flash rules
 flash: $(OUT)canboot.uf2 lib/rp2040_flash/rp2040_flash
 	@echo "  Flashing $< "
-	$(Q)./lib/rp2040_flash/rp2040_flash $(OUT)canboot.uf2
+	$(Q) $(if $(NOSUDO),,sudo) ./lib/rp2040_flash/rp2040_flash $(OUT)canboot.uf2
 
 # Deployer build
 deployer-y += generic/armcm_boot.c generic/armcm_reset.c $(mcu-y)