diff --git a/os/.gitignore b/sw/.gitignore
similarity index 100%
rename from os/.gitignore
rename to sw/.gitignore
diff --git a/os/01_get_buildroot.sh b/sw/01_get_buildroot.sh
similarity index 100%
rename from os/01_get_buildroot.sh
rename to sw/01_get_buildroot.sh
diff --git a/os/02_get_uboot.sh b/sw/02_get_uboot.sh
similarity index 100%
rename from os/02_get_uboot.sh
rename to sw/02_get_uboot.sh
diff --git a/os/03_get_kernel.sh b/sw/03_get_kernel.sh
similarity index 100%
rename from os/03_get_kernel.sh
rename to sw/03_get_kernel.sh
diff --git a/os/11_build_buildroot.sh b/sw/11_build_buildroot.sh
similarity index 100%
rename from os/11_build_buildroot.sh
rename to sw/11_build_buildroot.sh
diff --git a/os/12_build_uboot.sh b/sw/12_build_uboot.sh
similarity index 100%
rename from os/12_build_uboot.sh
rename to sw/12_build_uboot.sh
diff --git a/os/13_build_kernel.sh b/sw/13_build_kernel.sh
similarity index 100%
rename from os/13_build_kernel.sh
rename to sw/13_build_kernel.sh
diff --git a/os/14_build_devicetree.sh b/sw/14_build_devicetree.sh
similarity index 100%
rename from os/14_build_devicetree.sh
rename to sw/14_build_devicetree.sh
diff --git a/os/15_build_driver.sh b/sw/15_build_driver.sh
similarity index 100%
rename from os/15_build_driver.sh
rename to sw/15_build_driver.sh
diff --git a/os/16_build_userspace.sh b/sw/16_build_userspace.sh
similarity index 100%
rename from os/16_build_userspace.sh
rename to sw/16_build_userspace.sh
diff --git a/os/21_build_bootimg.sh b/sw/21_build_bootimg.sh
similarity index 100%
rename from os/21_build_bootimg.sh
rename to sw/21_build_bootimg.sh
diff --git a/os/22_prepare_sdcard.sh b/sw/22_prepare_sdcard.sh
similarity index 100%
rename from os/22_prepare_sdcard.sh
rename to sw/22_prepare_sdcard.sh
diff --git a/os/buildroot_overlay/etc/chrony.conf b/sw/buildroot_overlay/etc/chrony.conf
similarity index 100%
rename from os/buildroot_overlay/etc/chrony.conf
rename to sw/buildroot_overlay/etc/chrony.conf
diff --git a/os/buildroot_overlay/etc/chrony_dhcp.conf b/sw/buildroot_overlay/etc/chrony_dhcp.conf
similarity index 100%
rename from os/buildroot_overlay/etc/chrony_dhcp.conf
rename to sw/buildroot_overlay/etc/chrony_dhcp.conf
diff --git a/os/buildroot_overlay/etc/init.d/S03set_ethaddr.sh b/sw/buildroot_overlay/etc/init.d/S03set_ethaddr.sh
similarity index 100%
rename from os/buildroot_overlay/etc/init.d/S03set_ethaddr.sh
rename to sw/buildroot_overlay/etc/init.d/S03set_ethaddr.sh
diff --git a/os/buildroot_overlay/etc/init.d/S10prepare_dropbear.sh b/sw/buildroot_overlay/etc/init.d/S10prepare_dropbear.sh
similarity index 100%
rename from os/buildroot_overlay/etc/init.d/S10prepare_dropbear.sh
rename to sw/buildroot_overlay/etc/init.d/S10prepare_dropbear.sh
diff --git a/os/buildroot_overlay/etc/network/interfaces b/sw/buildroot_overlay/etc/network/interfaces
similarity index 100%
rename from os/buildroot_overlay/etc/network/interfaces
rename to sw/buildroot_overlay/etc/network/interfaces
diff --git a/os/buildroot_overlay/usr/share/udhcpc/default.script.d/ntp_chrony.script b/sw/buildroot_overlay/usr/share/udhcpc/default.script.d/ntp_chrony.script
similarity index 100%
rename from os/buildroot_overlay/usr/share/udhcpc/default.script.d/ntp_chrony.script
rename to sw/buildroot_overlay/usr/share/udhcpc/default.script.d/ntp_chrony.script
diff --git a/os/config/buildroot_puzzlefw_defconfig b/sw/config/buildroot_puzzlefw_defconfig
similarity index 100%
rename from os/config/buildroot_puzzlefw_defconfig
rename to sw/config/buildroot_puzzlefw_defconfig
diff --git a/os/config/linux_redpitaya_puzzlefw_defconfig b/sw/config/linux_redpitaya_puzzlefw_defconfig
similarity index 100%
rename from os/config/linux_redpitaya_puzzlefw_defconfig
rename to sw/config/linux_redpitaya_puzzlefw_defconfig
diff --git a/os/config/uboot_redpitaya_puzzlefw_defconfig b/sw/config/uboot_redpitaya_puzzlefw_defconfig
similarity index 100%
rename from os/config/uboot_redpitaya_puzzlefw_defconfig
rename to sw/config/uboot_redpitaya_puzzlefw_defconfig
diff --git a/os/config/uboot_script.txt b/sw/config/uboot_script.txt
similarity index 100%
rename from os/config/uboot_script.txt
rename to sw/config/uboot_script.txt
diff --git a/os/devicetree/redpitaya_puzzlefw.dts b/sw/devicetree/redpitaya_puzzlefw.dts
similarity index 100%
rename from os/devicetree/redpitaya_puzzlefw.dts
rename to sw/devicetree/redpitaya_puzzlefw.dts
diff --git a/os/fsbl/fsbl.elf b/sw/fsbl/fsbl.elf
similarity index 100%
rename from os/fsbl/fsbl.elf
rename to sw/fsbl/fsbl.elf
diff --git a/os/script_env b/sw/script_env
similarity index 100%
rename from os/script_env
rename to sw/script_env
diff --git a/os/src/linux_driver/.gitignore b/sw/src/linux_driver/.gitignore
similarity index 100%
rename from os/src/linux_driver/.gitignore
rename to sw/src/linux_driver/.gitignore
diff --git a/os/src/linux_driver/Makefile b/sw/src/linux_driver/Makefile
similarity index 100%
rename from os/src/linux_driver/Makefile
rename to sw/src/linux_driver/Makefile
diff --git a/os/src/linux_driver/puzzlefw.c b/sw/src/linux_driver/puzzlefw.c
similarity index 100%
rename from os/src/linux_driver/puzzlefw.c
rename to sw/src/linux_driver/puzzlefw.c
diff --git a/os/src/userspace/.gitignore b/sw/src/userspace/.gitignore
similarity index 100%
rename from os/src/userspace/.gitignore
rename to sw/src/userspace/.gitignore
diff --git a/os/src/userspace/Makefile b/sw/src/userspace/Makefile
similarity index 100%
rename from os/src/userspace/Makefile
rename to sw/src/userspace/Makefile
diff --git a/os/src/userspace/data_server.hpp b/sw/src/userspace/data_server.hpp
similarity index 100%
rename from os/src/userspace/data_server.hpp
rename to sw/src/userspace/data_server.hpp
diff --git a/os/src/userspace/interrupt_manager.hpp b/sw/src/userspace/interrupt_manager.hpp
similarity index 100%
rename from os/src/userspace/interrupt_manager.hpp
rename to sw/src/userspace/interrupt_manager.hpp
diff --git a/os/src/userspace/logging.hpp b/sw/src/userspace/logging.hpp
similarity index 100%
rename from os/src/userspace/logging.hpp
rename to sw/src/userspace/logging.hpp
diff --git a/os/src/userspace/puzzlecmd.cpp b/sw/src/userspace/puzzlecmd.cpp
similarity index 100%
rename from os/src/userspace/puzzlecmd.cpp
rename to sw/src/userspace/puzzlecmd.cpp
diff --git a/os/src/userspace/puzzlefw.cpp b/sw/src/userspace/puzzlefw.cpp
similarity index 100%
rename from os/src/userspace/puzzlefw.cpp
rename to sw/src/userspace/puzzlefw.cpp
diff --git a/os/src/userspace/puzzlefw.hpp b/sw/src/userspace/puzzlefw.hpp
similarity index 100%
rename from os/src/userspace/puzzlefw.hpp
rename to sw/src/userspace/puzzlefw.hpp
diff --git a/os/src/userspace/testje.c b/sw/src/userspace/testje.c
similarity index 100%
rename from os/src/userspace/testje.c
rename to sw/src/userspace/testje.c