diff --git a/kernel/Makefile b/kernel/Makefile
index de0ab82..a00f1f0 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -126,7 +126,7 @@ ifeq ($(arch), riscv32)
 ifeq ($(board), fpga)
 	@cp $(kernel) $@
 else
-	@cd ../riscv-pk && \
+	@cd ../tools/riscv-pk && \
 	mkdir -p build && \
 	cd build && \
 	../configure \
@@ -136,7 +136,7 @@ else
 		--host=riscv64-unknown-elf \
 		--with-payload=$(abspath $(kernel)) && \
 	make && \
-	cp bbl ../../kernel/$@
+	cp bbl ../../../kernel/$@
 endif
 else ifeq ($(arch), aarch64)
 	$(objcopy) $(kernel) --strip-all -O binary $@
diff --git a/tools/raspi-firmware/config.txt b/tools/raspi-firmware/config.txt
new file mode 100755
index 0000000..06364c5
--- /dev/null
+++ b/tools/raspi-firmware/config.txt
@@ -0,0 +1,56 @@
+# For more options and information see
+# http://rpf.io/configtxt
+# Some settings may impact device functionality. See link above for details
+
+# uncomment if you get no picture on HDMI for a default "safe" mode
+#hdmi_safe=1
+
+# uncomment this if your display has a black border of unused pixels visible
+# and your display can output without overscan
+#disable_overscan=1
+
+# uncomment the following to adjust overscan. Use positive numbers if console
+# goes off screen, and negative if there is too much border
+#overscan_left=16
+#overscan_right=16
+#overscan_top=16
+#overscan_bottom=16
+
+# uncomment to force a console size. By default it will be display's size minus
+# overscan.
+#framebuffer_width=1280
+#framebuffer_height=720
+
+# uncomment if hdmi display is not detected and composite is being output
+#hdmi_force_hotplug=1
+
+# uncomment to force a specific HDMI mode (this will force VGA)
+#hdmi_group=1
+#hdmi_mode=1
+
+# uncomment to force a HDMI mode rather than DVI. This can make audio work in
+# DMT (computer monitor) modes
+#hdmi_drive=2
+
+# uncomment to increase signal to HDMI, if you have interference, blanking, or
+# no display
+#config_hdmi_boost=4
+
+# uncomment for composite PAL
+#sdtv_mode=2
+
+#uncomment to overclock the arm. 700 MHz is the default.
+#arm_freq=800
+
+# Uncomment some or all of these to enable the optional hardware interfaces
+#dtparam=i2c_arm=on
+#dtparam=i2s=on
+#dtparam=spi=on
+
+# Uncomment this to enable the lirc-rpi module
+#dtoverlay=lirc-rpi
+
+# Additional overlays and parameters are documented /boot/overlays/README
+
+# Enable audio (loads snd_bcm2835)
+dtparam=audio=on
diff --git a/riscv-pk/.gitignore b/tools/riscv-pk/.gitignore
similarity index 100%
rename from riscv-pk/.gitignore
rename to tools/riscv-pk/.gitignore
diff --git a/riscv-pk/LICENSE b/tools/riscv-pk/LICENSE
similarity index 100%
rename from riscv-pk/LICENSE
rename to tools/riscv-pk/LICENSE
diff --git a/riscv-pk/Makefile.in b/tools/riscv-pk/Makefile.in
similarity index 100%
rename from riscv-pk/Makefile.in
rename to tools/riscv-pk/Makefile.in
diff --git a/riscv-pk/README.md b/tools/riscv-pk/README.md
similarity index 100%
rename from riscv-pk/README.md
rename to tools/riscv-pk/README.md
diff --git a/riscv-pk/aclocal.m4 b/tools/riscv-pk/aclocal.m4
similarity index 100%
rename from riscv-pk/aclocal.m4
rename to tools/riscv-pk/aclocal.m4
diff --git a/riscv-pk/bbl/bbl.ac b/tools/riscv-pk/bbl/bbl.ac
similarity index 100%
rename from riscv-pk/bbl/bbl.ac
rename to tools/riscv-pk/bbl/bbl.ac
diff --git a/riscv-pk/bbl/bbl.c b/tools/riscv-pk/bbl/bbl.c
similarity index 100%
rename from riscv-pk/bbl/bbl.c
rename to tools/riscv-pk/bbl/bbl.c
diff --git a/riscv-pk/bbl/bbl.h b/tools/riscv-pk/bbl/bbl.h
similarity index 100%
rename from riscv-pk/bbl/bbl.h
rename to tools/riscv-pk/bbl/bbl.h
diff --git a/riscv-pk/bbl/bbl.lds b/tools/riscv-pk/bbl/bbl.lds
similarity index 100%
rename from riscv-pk/bbl/bbl.lds
rename to tools/riscv-pk/bbl/bbl.lds
diff --git a/riscv-pk/bbl/bbl.mk.in b/tools/riscv-pk/bbl/bbl.mk.in
similarity index 100%
rename from riscv-pk/bbl/bbl.mk.in
rename to tools/riscv-pk/bbl/bbl.mk.in
diff --git a/riscv-pk/bbl/logo.c b/tools/riscv-pk/bbl/logo.c
similarity index 100%
rename from riscv-pk/bbl/logo.c
rename to tools/riscv-pk/bbl/logo.c
diff --git a/riscv-pk/bbl/payload.S b/tools/riscv-pk/bbl/payload.S
similarity index 100%
rename from riscv-pk/bbl/payload.S
rename to tools/riscv-pk/bbl/payload.S
diff --git a/riscv-pk/bbl/raw_logo.S b/tools/riscv-pk/bbl/raw_logo.S
similarity index 100%
rename from riscv-pk/bbl/raw_logo.S
rename to tools/riscv-pk/bbl/raw_logo.S
diff --git a/riscv-pk/bbl/riscv_logo.txt b/tools/riscv-pk/bbl/riscv_logo.txt
similarity index 100%
rename from riscv-pk/bbl/riscv_logo.txt
rename to tools/riscv-pk/bbl/riscv_logo.txt
diff --git a/riscv-pk/config.h.in b/tools/riscv-pk/config.h.in
similarity index 100%
rename from riscv-pk/config.h.in
rename to tools/riscv-pk/config.h.in
diff --git a/riscv-pk/configure b/tools/riscv-pk/configure
similarity index 100%
rename from riscv-pk/configure
rename to tools/riscv-pk/configure
diff --git a/riscv-pk/configure.ac b/tools/riscv-pk/configure.ac
similarity index 100%
rename from riscv-pk/configure.ac
rename to tools/riscv-pk/configure.ac
diff --git a/riscv-pk/dummy_payload/dummy_entry.S b/tools/riscv-pk/dummy_payload/dummy_entry.S
similarity index 100%
rename from riscv-pk/dummy_payload/dummy_entry.S
rename to tools/riscv-pk/dummy_payload/dummy_entry.S
diff --git a/riscv-pk/dummy_payload/dummy_payload.ac b/tools/riscv-pk/dummy_payload/dummy_payload.ac
similarity index 100%
rename from riscv-pk/dummy_payload/dummy_payload.ac
rename to tools/riscv-pk/dummy_payload/dummy_payload.ac
diff --git a/riscv-pk/dummy_payload/dummy_payload.c b/tools/riscv-pk/dummy_payload/dummy_payload.c
similarity index 100%
rename from riscv-pk/dummy_payload/dummy_payload.c
rename to tools/riscv-pk/dummy_payload/dummy_payload.c
diff --git a/riscv-pk/dummy_payload/dummy_payload.lds b/tools/riscv-pk/dummy_payload/dummy_payload.lds
similarity index 100%
rename from riscv-pk/dummy_payload/dummy_payload.lds
rename to tools/riscv-pk/dummy_payload/dummy_payload.lds
diff --git a/riscv-pk/dummy_payload/dummy_payload.mk.in b/tools/riscv-pk/dummy_payload/dummy_payload.mk.in
similarity index 100%
rename from riscv-pk/dummy_payload/dummy_payload.mk.in
rename to tools/riscv-pk/dummy_payload/dummy_payload.mk.in
diff --git a/riscv-pk/machine/atomic.h b/tools/riscv-pk/machine/atomic.h
similarity index 100%
rename from riscv-pk/machine/atomic.h
rename to tools/riscv-pk/machine/atomic.h
diff --git a/riscv-pk/machine/bits.h b/tools/riscv-pk/machine/bits.h
similarity index 100%
rename from riscv-pk/machine/bits.h
rename to tools/riscv-pk/machine/bits.h
diff --git a/riscv-pk/machine/disabled_hart_mask.h b/tools/riscv-pk/machine/disabled_hart_mask.h
similarity index 100%
rename from riscv-pk/machine/disabled_hart_mask.h
rename to tools/riscv-pk/machine/disabled_hart_mask.h
diff --git a/riscv-pk/machine/emulation.c b/tools/riscv-pk/machine/emulation.c
similarity index 100%
rename from riscv-pk/machine/emulation.c
rename to tools/riscv-pk/machine/emulation.c
diff --git a/riscv-pk/machine/emulation.h b/tools/riscv-pk/machine/emulation.h
similarity index 100%
rename from riscv-pk/machine/emulation.h
rename to tools/riscv-pk/machine/emulation.h
diff --git a/riscv-pk/machine/encoding.h b/tools/riscv-pk/machine/encoding.h
similarity index 100%
rename from riscv-pk/machine/encoding.h
rename to tools/riscv-pk/machine/encoding.h
diff --git a/riscv-pk/machine/fdt.c b/tools/riscv-pk/machine/fdt.c
similarity index 100%
rename from riscv-pk/machine/fdt.c
rename to tools/riscv-pk/machine/fdt.c
diff --git a/riscv-pk/machine/fdt.h b/tools/riscv-pk/machine/fdt.h
similarity index 100%
rename from riscv-pk/machine/fdt.h
rename to tools/riscv-pk/machine/fdt.h
diff --git a/riscv-pk/machine/finisher.c b/tools/riscv-pk/machine/finisher.c
similarity index 100%
rename from riscv-pk/machine/finisher.c
rename to tools/riscv-pk/machine/finisher.c
diff --git a/riscv-pk/machine/finisher.h b/tools/riscv-pk/machine/finisher.h
similarity index 100%
rename from riscv-pk/machine/finisher.h
rename to tools/riscv-pk/machine/finisher.h
diff --git a/riscv-pk/machine/flush_icache.c b/tools/riscv-pk/machine/flush_icache.c
similarity index 100%
rename from riscv-pk/machine/flush_icache.c
rename to tools/riscv-pk/machine/flush_icache.c
diff --git a/riscv-pk/machine/htif.c b/tools/riscv-pk/machine/htif.c
similarity index 100%
rename from riscv-pk/machine/htif.c
rename to tools/riscv-pk/machine/htif.c
diff --git a/riscv-pk/machine/htif.h b/tools/riscv-pk/machine/htif.h
similarity index 100%
rename from riscv-pk/machine/htif.h
rename to tools/riscv-pk/machine/htif.h
diff --git a/riscv-pk/machine/machine.ac b/tools/riscv-pk/machine/machine.ac
similarity index 100%
rename from riscv-pk/machine/machine.ac
rename to tools/riscv-pk/machine/machine.ac
diff --git a/riscv-pk/machine/machine.mk.in b/tools/riscv-pk/machine/machine.mk.in
similarity index 100%
rename from riscv-pk/machine/machine.mk.in
rename to tools/riscv-pk/machine/machine.mk.in
diff --git a/riscv-pk/machine/mcall.h b/tools/riscv-pk/machine/mcall.h
similarity index 100%
rename from riscv-pk/machine/mcall.h
rename to tools/riscv-pk/machine/mcall.h
diff --git a/riscv-pk/machine/mentry.S b/tools/riscv-pk/machine/mentry.S
similarity index 100%
rename from riscv-pk/machine/mentry.S
rename to tools/riscv-pk/machine/mentry.S
diff --git a/riscv-pk/machine/minit.c b/tools/riscv-pk/machine/minit.c
similarity index 100%
rename from riscv-pk/machine/minit.c
rename to tools/riscv-pk/machine/minit.c
diff --git a/riscv-pk/machine/misaligned_ldst.c b/tools/riscv-pk/machine/misaligned_ldst.c
similarity index 100%
rename from riscv-pk/machine/misaligned_ldst.c
rename to tools/riscv-pk/machine/misaligned_ldst.c
diff --git a/riscv-pk/machine/mtrap.c b/tools/riscv-pk/machine/mtrap.c
similarity index 100%
rename from riscv-pk/machine/mtrap.c
rename to tools/riscv-pk/machine/mtrap.c
diff --git a/riscv-pk/machine/mtrap.h b/tools/riscv-pk/machine/mtrap.h
similarity index 100%
rename from riscv-pk/machine/mtrap.h
rename to tools/riscv-pk/machine/mtrap.h
diff --git a/riscv-pk/machine/muldiv_emulation.c b/tools/riscv-pk/machine/muldiv_emulation.c
similarity index 100%
rename from riscv-pk/machine/muldiv_emulation.c
rename to tools/riscv-pk/machine/muldiv_emulation.c
diff --git a/riscv-pk/machine/uart.c b/tools/riscv-pk/machine/uart.c
similarity index 100%
rename from riscv-pk/machine/uart.c
rename to tools/riscv-pk/machine/uart.c
diff --git a/riscv-pk/machine/uart.h b/tools/riscv-pk/machine/uart.h
similarity index 100%
rename from riscv-pk/machine/uart.h
rename to tools/riscv-pk/machine/uart.h
diff --git a/riscv-pk/machine/uart16550.c b/tools/riscv-pk/machine/uart16550.c
similarity index 100%
rename from riscv-pk/machine/uart16550.c
rename to tools/riscv-pk/machine/uart16550.c
diff --git a/riscv-pk/machine/uart16550.h b/tools/riscv-pk/machine/uart16550.h
similarity index 100%
rename from riscv-pk/machine/uart16550.h
rename to tools/riscv-pk/machine/uart16550.h
diff --git a/riscv-pk/machine/unprivileged_memory.h b/tools/riscv-pk/machine/unprivileged_memory.h
similarity index 100%
rename from riscv-pk/machine/unprivileged_memory.h
rename to tools/riscv-pk/machine/unprivileged_memory.h
diff --git a/riscv-pk/machine/vm.h b/tools/riscv-pk/machine/vm.h
similarity index 100%
rename from riscv-pk/machine/vm.h
rename to tools/riscv-pk/machine/vm.h
diff --git a/riscv-pk/scripts/config.guess b/tools/riscv-pk/scripts/config.guess
similarity index 100%
rename from riscv-pk/scripts/config.guess
rename to tools/riscv-pk/scripts/config.guess
diff --git a/riscv-pk/scripts/config.sub b/tools/riscv-pk/scripts/config.sub
similarity index 100%
rename from riscv-pk/scripts/config.sub
rename to tools/riscv-pk/scripts/config.sub
diff --git a/riscv-pk/scripts/install.sh b/tools/riscv-pk/scripts/install.sh
similarity index 100%
rename from riscv-pk/scripts/install.sh
rename to tools/riscv-pk/scripts/install.sh
diff --git a/riscv-pk/scripts/mk-install-dirs.sh b/tools/riscv-pk/scripts/mk-install-dirs.sh
similarity index 100%
rename from riscv-pk/scripts/mk-install-dirs.sh
rename to tools/riscv-pk/scripts/mk-install-dirs.sh
diff --git a/riscv-pk/scripts/vcs-version.sh b/tools/riscv-pk/scripts/vcs-version.sh
similarity index 100%
rename from riscv-pk/scripts/vcs-version.sh
rename to tools/riscv-pk/scripts/vcs-version.sh
diff --git a/riscv-pk/util/snprintf.c b/tools/riscv-pk/util/snprintf.c
similarity index 100%
rename from riscv-pk/util/snprintf.c
rename to tools/riscv-pk/util/snprintf.c
diff --git a/riscv-pk/util/string.c b/tools/riscv-pk/util/string.c
similarity index 100%
rename from riscv-pk/util/string.c
rename to tools/riscv-pk/util/string.c
diff --git a/riscv-pk/util/util.ac b/tools/riscv-pk/util/util.ac
similarity index 100%
rename from riscv-pk/util/util.ac
rename to tools/riscv-pk/util/util.ac
diff --git a/riscv-pk/util/util.mk.in b/tools/riscv-pk/util/util.mk.in
similarity index 100%
rename from riscv-pk/util/util.mk.in
rename to tools/riscv-pk/util/util.mk.in