diff --git a/micropython/boardloader/.gitignore b/embed/boardloader/.gitignore
similarity index 100%
rename from micropython/boardloader/.gitignore
rename to embed/boardloader/.gitignore
diff --git a/micropython/boardloader/main.c b/embed/boardloader/main.c
similarity index 100%
rename from micropython/boardloader/main.c
rename to embed/boardloader/main.c
diff --git a/micropython/boardloader/memory.ld b/embed/boardloader/memory.ld
similarity index 100%
rename from micropython/boardloader/memory.ld
rename to embed/boardloader/memory.ld
diff --git a/micropython/boardloader/version.h b/embed/boardloader/version.h
similarity index 100%
rename from micropython/boardloader/version.h
rename to embed/boardloader/version.h
diff --git a/micropython/bootloader/.gitignore b/embed/bootloader/.gitignore
similarity index 100%
rename from micropython/bootloader/.gitignore
rename to embed/bootloader/.gitignore
diff --git a/micropython/bootloader/header.S b/embed/bootloader/header.S
similarity index 100%
rename from micropython/bootloader/header.S
rename to embed/bootloader/header.S
diff --git a/micropython/bootloader/main.c b/embed/bootloader/main.c
similarity index 100%
rename from micropython/bootloader/main.c
rename to embed/bootloader/main.c
diff --git a/micropython/bootloader/memory.ld b/embed/bootloader/memory.ld
similarity index 100%
rename from micropython/bootloader/memory.ld
rename to embed/bootloader/memory.ld
diff --git a/micropython/bootloader/messages.c b/embed/bootloader/messages.c
similarity index 100%
rename from micropython/bootloader/messages.c
rename to embed/bootloader/messages.c
diff --git a/micropython/bootloader/messages.h b/embed/bootloader/messages.h
similarity index 100%
rename from micropython/bootloader/messages.h
rename to embed/bootloader/messages.h
diff --git a/micropython/bootloader/nanopb/pb.h b/embed/bootloader/nanopb/pb.h
similarity index 100%
rename from micropython/bootloader/nanopb/pb.h
rename to embed/bootloader/nanopb/pb.h
diff --git a/micropython/bootloader/nanopb/pb_common.c b/embed/bootloader/nanopb/pb_common.c
similarity index 100%
rename from micropython/bootloader/nanopb/pb_common.c
rename to embed/bootloader/nanopb/pb_common.c
diff --git a/micropython/bootloader/nanopb/pb_common.h b/embed/bootloader/nanopb/pb_common.h
similarity index 100%
rename from micropython/bootloader/nanopb/pb_common.h
rename to embed/bootloader/nanopb/pb_common.h
diff --git a/micropython/bootloader/nanopb/pb_decode.c b/embed/bootloader/nanopb/pb_decode.c
similarity index 100%
rename from micropython/bootloader/nanopb/pb_decode.c
rename to embed/bootloader/nanopb/pb_decode.c
diff --git a/micropython/bootloader/nanopb/pb_decode.h b/embed/bootloader/nanopb/pb_decode.h
similarity index 100%
rename from micropython/bootloader/nanopb/pb_decode.h
rename to embed/bootloader/nanopb/pb_decode.h
diff --git a/micropython/bootloader/nanopb/pb_encode.c b/embed/bootloader/nanopb/pb_encode.c
similarity index 100%
rename from micropython/bootloader/nanopb/pb_encode.c
rename to embed/bootloader/nanopb/pb_encode.c
diff --git a/micropython/bootloader/nanopb/pb_encode.h b/embed/bootloader/nanopb/pb_encode.h
similarity index 100%
rename from micropython/bootloader/nanopb/pb_encode.h
rename to embed/bootloader/nanopb/pb_encode.h
diff --git a/micropython/bootloader/protob/.gitignore b/embed/bootloader/protob/.gitignore
similarity index 100%
rename from micropython/bootloader/protob/.gitignore
rename to embed/bootloader/protob/.gitignore
diff --git a/micropython/bootloader/protob/Makefile b/embed/bootloader/protob/Makefile
similarity index 100%
rename from micropython/bootloader/protob/Makefile
rename to embed/bootloader/protob/Makefile
diff --git a/micropython/bootloader/protob/messages.options b/embed/bootloader/protob/messages.options
similarity index 100%
rename from micropython/bootloader/protob/messages.options
rename to embed/bootloader/protob/messages.options
diff --git a/micropython/bootloader/protob/messages.pb.c b/embed/bootloader/protob/messages.pb.c
similarity index 100%
rename from micropython/bootloader/protob/messages.pb.c
rename to embed/bootloader/protob/messages.pb.c
diff --git a/micropython/bootloader/protob/messages.pb.h b/embed/bootloader/protob/messages.pb.h
similarity index 100%
rename from micropython/bootloader/protob/messages.pb.h
rename to embed/bootloader/protob/messages.pb.h
diff --git a/micropython/bootloader/protob/messages.proto b/embed/bootloader/protob/messages.proto
similarity index 100%
rename from micropython/bootloader/protob/messages.proto
rename to embed/bootloader/protob/messages.proto
diff --git a/micropython/bootloader/protob/types.options b/embed/bootloader/protob/types.options
similarity index 100%
rename from micropython/bootloader/protob/types.options
rename to embed/bootloader/protob/types.options
diff --git a/micropython/bootloader/protob/types.pb.c b/embed/bootloader/protob/types.pb.c
similarity index 100%
rename from micropython/bootloader/protob/types.pb.c
rename to embed/bootloader/protob/types.pb.c
diff --git a/micropython/bootloader/protob/types.pb.h b/embed/bootloader/protob/types.pb.h
similarity index 100%
rename from micropython/bootloader/protob/types.pb.h
rename to embed/bootloader/protob/types.pb.h
diff --git a/micropython/bootloader/protob/types.proto b/embed/bootloader/protob/types.proto
similarity index 100%
rename from micropython/bootloader/protob/types.proto
rename to embed/bootloader/protob/types.proto
diff --git a/micropython/bootloader/version.h b/embed/bootloader/version.h
similarity index 100%
rename from micropython/bootloader/version.h
rename to embed/bootloader/version.h
diff --git a/micropython/extmod/modtrezorconfig/.gitignore b/embed/extmod/modtrezorconfig/.gitignore
similarity index 100%
rename from micropython/extmod/modtrezorconfig/.gitignore
rename to embed/extmod/modtrezorconfig/.gitignore
diff --git a/micropython/extmod/modtrezorconfig/modtrezorconfig.c b/embed/extmod/modtrezorconfig/modtrezorconfig.c
similarity index 100%
rename from micropython/extmod/modtrezorconfig/modtrezorconfig.c
rename to embed/extmod/modtrezorconfig/modtrezorconfig.c
diff --git a/micropython/extmod/modtrezorconfig/norcow.c b/embed/extmod/modtrezorconfig/norcow.c
similarity index 100%
rename from micropython/extmod/modtrezorconfig/norcow.c
rename to embed/extmod/modtrezorconfig/norcow.c
diff --git a/micropython/extmod/modtrezorconfig/norcow.h b/embed/extmod/modtrezorconfig/norcow.h
similarity index 100%
rename from micropython/extmod/modtrezorconfig/norcow.h
rename to embed/extmod/modtrezorconfig/norcow.h
diff --git a/micropython/extmod/modtrezorconfig/norcow_config.h b/embed/extmod/modtrezorconfig/norcow_config.h
similarity index 100%
rename from micropython/extmod/modtrezorconfig/norcow_config.h
rename to embed/extmod/modtrezorconfig/norcow_config.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-aes.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-aes.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-aes.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-aes.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-bip32.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-bip32.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-bip32.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-bip32.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-bip39.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-bip39.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-bip39.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-bip39.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-blake2b.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-blake2b.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-blake2b.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-blake2b.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-blake2s.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-blake2s.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-blake2s.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-blake2s.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-curve25519.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-curve25519.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-curve25519.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-curve25519.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-ed25519.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-ed25519.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-ed25519.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-ed25519.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-nist256p1.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-nist256p1.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-nist256p1.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-nist256p1.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-pbkdf2.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-pbkdf2.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-pbkdf2.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-pbkdf2.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-random.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-random.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-random.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-random.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-rfc6979.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-rfc6979.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-rfc6979.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-rfc6979.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-ripemd160.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-ripemd160.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-ripemd160.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-ripemd160.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-secp256k1.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-secp256k1.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-secp256k1.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-secp256k1.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-sha1.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-sha1.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-sha1.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-sha1.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-sha256.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-sha256.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-sha256.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-sha256.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-sha3-256.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-sha3-256.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-sha3-256.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-sha3-256.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-sha3-512.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-sha3-512.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-sha3-512.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-sha3-512.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-sha512.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-sha512.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-sha512.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-sha512.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto-ssss.h b/embed/extmod/modtrezorcrypto/modtrezorcrypto-ssss.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto-ssss.h
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto-ssss.h
diff --git a/micropython/extmod/modtrezorcrypto/modtrezorcrypto.c b/embed/extmod/modtrezorcrypto/modtrezorcrypto.c
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/modtrezorcrypto.c
rename to embed/extmod/modtrezorcrypto/modtrezorcrypto.c
diff --git a/micropython/extmod/modtrezorcrypto/rand.c b/embed/extmod/modtrezorcrypto/rand.c
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/rand.c
rename to embed/extmod/modtrezorcrypto/rand.c
diff --git a/micropython/extmod/modtrezorcrypto/rand.h b/embed/extmod/modtrezorcrypto/rand.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/rand.h
rename to embed/extmod/modtrezorcrypto/rand.h
diff --git a/micropython/extmod/modtrezorcrypto/ssss.c b/embed/extmod/modtrezorcrypto/ssss.c
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/ssss.c
rename to embed/extmod/modtrezorcrypto/ssss.c
diff --git a/micropython/extmod/modtrezorcrypto/ssss.h b/embed/extmod/modtrezorcrypto/ssss.h
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/ssss.h
rename to embed/extmod/modtrezorcrypto/ssss.h
diff --git a/micropython/extmod/modtrezorcrypto/trezor-crypto b/embed/extmod/modtrezorcrypto/trezor-crypto
similarity index 100%
rename from micropython/extmod/modtrezorcrypto/trezor-crypto
rename to embed/extmod/modtrezorcrypto/trezor-crypto
diff --git a/micropython/extmod/modtrezorio/modtrezorio-sdcard.h b/embed/extmod/modtrezorio/modtrezorio-sdcard.h
similarity index 100%
rename from micropython/extmod/modtrezorio/modtrezorio-sdcard.h
rename to embed/extmod/modtrezorio/modtrezorio-sdcard.h
diff --git a/micropython/extmod/modtrezorio/modtrezorio.c b/embed/extmod/modtrezorio/modtrezorio.c
similarity index 100%
rename from micropython/extmod/modtrezorio/modtrezorio.c
rename to embed/extmod/modtrezorio/modtrezorio.c
diff --git a/micropython/extmod/modtrezorio/unix-sdcard-mock.h b/embed/extmod/modtrezorio/unix-sdcard-mock.h
similarity index 100%
rename from micropython/extmod/modtrezorio/unix-sdcard-mock.h
rename to embed/extmod/modtrezorio/unix-sdcard-mock.h
diff --git a/micropython/extmod/modtrezormsg/modtrezormsg-stm32.h b/embed/extmod/modtrezormsg/modtrezormsg-stm32.h
similarity index 100%
rename from micropython/extmod/modtrezormsg/modtrezormsg-stm32.h
rename to embed/extmod/modtrezormsg/modtrezormsg-stm32.h
diff --git a/micropython/extmod/modtrezormsg/modtrezormsg-unix.h b/embed/extmod/modtrezormsg/modtrezormsg-unix.h
similarity index 100%
rename from micropython/extmod/modtrezormsg/modtrezormsg-unix.h
rename to embed/extmod/modtrezormsg/modtrezormsg-unix.h
diff --git a/micropython/extmod/modtrezormsg/modtrezormsg.c b/embed/extmod/modtrezormsg/modtrezormsg.c
similarity index 100%
rename from micropython/extmod/modtrezormsg/modtrezormsg.c
rename to embed/extmod/modtrezormsg/modtrezormsg.c
diff --git a/micropython/extmod/modtrezorui/display-stm32.h b/embed/extmod/modtrezorui/display-stm32.h
similarity index 100%
rename from micropython/extmod/modtrezorui/display-stm32.h
rename to embed/extmod/modtrezorui/display-stm32.h
diff --git a/micropython/extmod/modtrezorui/display-unix.h b/embed/extmod/modtrezorui/display-unix.h
similarity index 100%
rename from micropython/extmod/modtrezorui/display-unix.h
rename to embed/extmod/modtrezorui/display-unix.h
diff --git a/micropython/extmod/modtrezorui/display.c b/embed/extmod/modtrezorui/display.c
similarity index 100%
rename from micropython/extmod/modtrezorui/display.c
rename to embed/extmod/modtrezorui/display.c
diff --git a/micropython/extmod/modtrezorui/display.h b/embed/extmod/modtrezorui/display.h
similarity index 100%
rename from micropython/extmod/modtrezorui/display.h
rename to embed/extmod/modtrezorui/display.h
diff --git a/micropython/extmod/modtrezorui/font_bitmap.c b/embed/extmod/modtrezorui/font_bitmap.c
similarity index 100%
rename from micropython/extmod/modtrezorui/font_bitmap.c
rename to embed/extmod/modtrezorui/font_bitmap.c
diff --git a/micropython/extmod/modtrezorui/font_bitmap.h b/embed/extmod/modtrezorui/font_bitmap.h
similarity index 100%
rename from micropython/extmod/modtrezorui/font_bitmap.h
rename to embed/extmod/modtrezorui/font_bitmap.h
diff --git a/micropython/extmod/modtrezorui/font_roboto_bold_20.c b/embed/extmod/modtrezorui/font_roboto_bold_20.c
similarity index 100%
rename from micropython/extmod/modtrezorui/font_roboto_bold_20.c
rename to embed/extmod/modtrezorui/font_roboto_bold_20.c
diff --git a/micropython/extmod/modtrezorui/font_roboto_bold_20.h b/embed/extmod/modtrezorui/font_roboto_bold_20.h
similarity index 100%
rename from micropython/extmod/modtrezorui/font_roboto_bold_20.h
rename to embed/extmod/modtrezorui/font_roboto_bold_20.h
diff --git a/micropython/extmod/modtrezorui/font_roboto_regular_20.c b/embed/extmod/modtrezorui/font_roboto_regular_20.c
similarity index 100%
rename from micropython/extmod/modtrezorui/font_roboto_regular_20.c
rename to embed/extmod/modtrezorui/font_roboto_regular_20.c
diff --git a/micropython/extmod/modtrezorui/font_roboto_regular_20.h b/embed/extmod/modtrezorui/font_roboto_regular_20.h
similarity index 100%
rename from micropython/extmod/modtrezorui/font_roboto_regular_20.h
rename to embed/extmod/modtrezorui/font_roboto_regular_20.h
diff --git a/micropython/extmod/modtrezorui/font_robotomono_regular_20.c b/embed/extmod/modtrezorui/font_robotomono_regular_20.c
similarity index 100%
rename from micropython/extmod/modtrezorui/font_robotomono_regular_20.c
rename to embed/extmod/modtrezorui/font_robotomono_regular_20.c
diff --git a/micropython/extmod/modtrezorui/font_robotomono_regular_20.h b/embed/extmod/modtrezorui/font_robotomono_regular_20.h
similarity index 100%
rename from micropython/extmod/modtrezorui/font_robotomono_regular_20.h
rename to embed/extmod/modtrezorui/font_robotomono_regular_20.h
diff --git a/micropython/extmod/modtrezorui/inflate.c b/embed/extmod/modtrezorui/inflate.c
similarity index 100%
rename from micropython/extmod/modtrezorui/inflate.c
rename to embed/extmod/modtrezorui/inflate.c
diff --git a/micropython/extmod/modtrezorui/inflate.h b/embed/extmod/modtrezorui/inflate.h
similarity index 100%
rename from micropython/extmod/modtrezorui/inflate.h
rename to embed/extmod/modtrezorui/inflate.h
diff --git a/micropython/extmod/modtrezorui/loader.h b/embed/extmod/modtrezorui/loader.h
similarity index 100%
rename from micropython/extmod/modtrezorui/loader.h
rename to embed/extmod/modtrezorui/loader.h
diff --git a/micropython/extmod/modtrezorui/loader_gen.py b/embed/extmod/modtrezorui/loader_gen.py
similarity index 100%
rename from micropython/extmod/modtrezorui/loader_gen.py
rename to embed/extmod/modtrezorui/loader_gen.py
diff --git a/micropython/extmod/modtrezorui/modtrezorui-display.h b/embed/extmod/modtrezorui/modtrezorui-display.h
similarity index 100%
rename from micropython/extmod/modtrezorui/modtrezorui-display.h
rename to embed/extmod/modtrezorui/modtrezorui-display.h
diff --git a/micropython/extmod/modtrezorui/modtrezorui.c b/embed/extmod/modtrezorui/modtrezorui.c
similarity index 100%
rename from micropython/extmod/modtrezorui/modtrezorui.c
rename to embed/extmod/modtrezorui/modtrezorui.c
diff --git a/micropython/extmod/modtrezorui/trezor-qrenc b/embed/extmod/modtrezorui/trezor-qrenc
similarity index 100%
rename from micropython/extmod/modtrezorui/trezor-qrenc
rename to embed/extmod/modtrezorui/trezor-qrenc
diff --git a/micropython/extmod/modtrezorutils/modtrezorutils.c b/embed/extmod/modtrezorutils/modtrezorutils.c
similarity index 100%
rename from micropython/extmod/modtrezorutils/modtrezorutils.c
rename to embed/extmod/modtrezorutils/modtrezorutils.c
diff --git a/micropython/firmware/.gitignore b/embed/firmware/.gitignore
similarity index 100%
rename from micropython/firmware/.gitignore
rename to embed/firmware/.gitignore
diff --git a/micropython/firmware/header.S b/embed/firmware/header.S
similarity index 100%
rename from micropython/firmware/header.S
rename to embed/firmware/header.S
diff --git a/micropython/firmware/main.c b/embed/firmware/main.c
similarity index 100%
rename from micropython/firmware/main.c
rename to embed/firmware/main.c
diff --git a/micropython/firmware/memory.ld b/embed/firmware/memory.ld
similarity index 100%
rename from micropython/firmware/memory.ld
rename to embed/firmware/memory.ld
diff --git a/micropython/firmware/modutime.c b/embed/firmware/modutime.c
similarity index 100%
rename from micropython/firmware/modutime.c
rename to embed/firmware/modutime.c
diff --git a/micropython/firmware/mpconfigport.h b/embed/firmware/mpconfigport.h
similarity index 100%
rename from micropython/firmware/mpconfigport.h
rename to embed/firmware/mpconfigport.h
diff --git a/micropython/firmware/mphalport.c b/embed/firmware/mphalport.c
similarity index 100%
rename from micropython/firmware/mphalport.c
rename to embed/firmware/mphalport.c
diff --git a/micropython/firmware/mphalport.h b/embed/firmware/mphalport.h
similarity index 100%
rename from micropython/firmware/mphalport.h
rename to embed/firmware/mphalport.h
diff --git a/micropython/firmware/version.h b/embed/firmware/version.h
similarity index 100%
rename from micropython/firmware/version.h
rename to embed/firmware/version.h
diff --git a/micropython/trezorhal/common.c b/embed/trezorhal/common.c
similarity index 100%
rename from micropython/trezorhal/common.c
rename to embed/trezorhal/common.c
diff --git a/micropython/trezorhal/common.h b/embed/trezorhal/common.h
similarity index 100%
rename from micropython/trezorhal/common.h
rename to embed/trezorhal/common.h
diff --git a/micropython/trezorhal/flash.c b/embed/trezorhal/flash.c
similarity index 100%
rename from micropython/trezorhal/flash.c
rename to embed/trezorhal/flash.c
diff --git a/micropython/trezorhal/flash.h b/embed/trezorhal/flash.h
similarity index 100%
rename from micropython/trezorhal/flash.h
rename to embed/trezorhal/flash.h
diff --git a/micropython/trezorhal/hal/stm32f4xx_hal_conf.h b/embed/trezorhal/hal/stm32f4xx_hal_conf.h
similarity index 100%
rename from micropython/trezorhal/hal/stm32f4xx_hal_conf.h
rename to embed/trezorhal/hal/stm32f4xx_hal_conf.h
diff --git a/micropython/trezorhal/hal/stm32f4xx_hal_sram.c b/embed/trezorhal/hal/stm32f4xx_hal_sram.c
similarity index 100%
rename from micropython/trezorhal/hal/stm32f4xx_hal_sram.c
rename to embed/trezorhal/hal/stm32f4xx_hal_sram.c
diff --git a/micropython/trezorhal/hal/stm32f4xx_hal_sram.h b/embed/trezorhal/hal/stm32f4xx_hal_sram.h
similarity index 100%
rename from micropython/trezorhal/hal/stm32f4xx_hal_sram.h
rename to embed/trezorhal/hal/stm32f4xx_hal_sram.h
diff --git a/micropython/trezorhal/hal/stm32f4xx_ll_fsmc.c b/embed/trezorhal/hal/stm32f4xx_ll_fsmc.c
similarity index 100%
rename from micropython/trezorhal/hal/stm32f4xx_ll_fsmc.c
rename to embed/trezorhal/hal/stm32f4xx_ll_fsmc.c
diff --git a/micropython/trezorhal/hal/stm32f4xx_ll_fsmc.h b/embed/trezorhal/hal/stm32f4xx_ll_fsmc.h
similarity index 100%
rename from micropython/trezorhal/hal/stm32f4xx_ll_fsmc.h
rename to embed/trezorhal/hal/stm32f4xx_ll_fsmc.h
diff --git a/micropython/trezorhal/image.c b/embed/trezorhal/image.c
similarity index 100%
rename from micropython/trezorhal/image.c
rename to embed/trezorhal/image.c
diff --git a/micropython/trezorhal/image.h b/embed/trezorhal/image.h
similarity index 100%
rename from micropython/trezorhal/image.h
rename to embed/trezorhal/image.h
diff --git a/micropython/trezorhal/mini_printf.c b/embed/trezorhal/mini_printf.c
similarity index 100%
rename from micropython/trezorhal/mini_printf.c
rename to embed/trezorhal/mini_printf.c
diff --git a/micropython/trezorhal/mini_printf.h b/embed/trezorhal/mini_printf.h
similarity index 100%
rename from micropython/trezorhal/mini_printf.h
rename to embed/trezorhal/mini_printf.h
diff --git a/micropython/trezorhal/rng.c b/embed/trezorhal/rng.c
similarity index 100%
rename from micropython/trezorhal/rng.c
rename to embed/trezorhal/rng.c
diff --git a/micropython/trezorhal/rng.h b/embed/trezorhal/rng.h
similarity index 100%
rename from micropython/trezorhal/rng.h
rename to embed/trezorhal/rng.h
diff --git a/micropython/trezorhal/sdcard.c b/embed/trezorhal/sdcard.c
similarity index 100%
rename from micropython/trezorhal/sdcard.c
rename to embed/trezorhal/sdcard.c
diff --git a/micropython/trezorhal/sdcard.h b/embed/trezorhal/sdcard.h
similarity index 100%
rename from micropython/trezorhal/sdcard.h
rename to embed/trezorhal/sdcard.h
diff --git a/micropython/trezorhal/stm32_it.c b/embed/trezorhal/stm32_it.c
similarity index 100%
rename from micropython/trezorhal/stm32_it.c
rename to embed/trezorhal/stm32_it.c
diff --git a/micropython/trezorhal/stm32_system.c b/embed/trezorhal/stm32_system.c
similarity index 100%
rename from micropython/trezorhal/stm32_system.c
rename to embed/trezorhal/stm32_system.c
diff --git a/micropython/trezorhal/touch.c b/embed/trezorhal/touch.c
similarity index 100%
rename from micropython/trezorhal/touch.c
rename to embed/trezorhal/touch.c
diff --git a/micropython/trezorhal/touch.h b/embed/trezorhal/touch.h
similarity index 100%
rename from micropython/trezorhal/touch.h
rename to embed/trezorhal/touch.h
diff --git a/micropython/trezorhal/usb.c b/embed/trezorhal/usb.c
similarity index 100%
rename from micropython/trezorhal/usb.c
rename to embed/trezorhal/usb.c
diff --git a/micropython/trezorhal/usb.h b/embed/trezorhal/usb.h
similarity index 100%
rename from micropython/trezorhal/usb.h
rename to embed/trezorhal/usb.h
diff --git a/micropython/trezorhal/usb_hid-defs.h b/embed/trezorhal/usb_hid-defs.h
similarity index 100%
rename from micropython/trezorhal/usb_hid-defs.h
rename to embed/trezorhal/usb_hid-defs.h
diff --git a/micropython/trezorhal/usb_hid-impl.h b/embed/trezorhal/usb_hid-impl.h
similarity index 100%
rename from micropython/trezorhal/usb_hid-impl.h
rename to embed/trezorhal/usb_hid-impl.h
diff --git a/micropython/trezorhal/usb_vcp-defs.h b/embed/trezorhal/usb_vcp-defs.h
similarity index 100%
rename from micropython/trezorhal/usb_vcp-defs.h
rename to embed/trezorhal/usb_vcp-defs.h
diff --git a/micropython/trezorhal/usb_vcp-impl.h b/embed/trezorhal/usb_vcp-impl.h
similarity index 100%
rename from micropython/trezorhal/usb_vcp-impl.h
rename to embed/trezorhal/usb_vcp-impl.h
diff --git a/micropython/trezorhal/usbd_conf.c b/embed/trezorhal/usbd_conf.c
similarity index 100%
rename from micropython/trezorhal/usbd_conf.c
rename to embed/trezorhal/usbd_conf.c
diff --git a/micropython/trezorhal/usbd_conf.h b/embed/trezorhal/usbd_conf.h
similarity index 100%
rename from micropython/trezorhal/usbd_conf.h
rename to embed/trezorhal/usbd_conf.h
diff --git a/micropython/trezorhal/usbd_core.c b/embed/trezorhal/usbd_core.c
similarity index 100%
rename from micropython/trezorhal/usbd_core.c
rename to embed/trezorhal/usbd_core.c
diff --git a/micropython/trezorhal/usbd_core.h b/embed/trezorhal/usbd_core.h
similarity index 100%
rename from micropython/trezorhal/usbd_core.h
rename to embed/trezorhal/usbd_core.h
diff --git a/micropython/trezorhal/usbd_ctlreq.c b/embed/trezorhal/usbd_ctlreq.c
similarity index 100%
rename from micropython/trezorhal/usbd_ctlreq.c
rename to embed/trezorhal/usbd_ctlreq.c
diff --git a/micropython/trezorhal/usbd_ctlreq.h b/embed/trezorhal/usbd_ctlreq.h
similarity index 100%
rename from micropython/trezorhal/usbd_ctlreq.h
rename to embed/trezorhal/usbd_ctlreq.h
diff --git a/micropython/trezorhal/usbd_def.h b/embed/trezorhal/usbd_def.h
similarity index 100%
rename from micropython/trezorhal/usbd_def.h
rename to embed/trezorhal/usbd_def.h
diff --git a/micropython/trezorhal/usbd_ioreq.c b/embed/trezorhal/usbd_ioreq.c
similarity index 100%
rename from micropython/trezorhal/usbd_ioreq.c
rename to embed/trezorhal/usbd_ioreq.c
diff --git a/micropython/trezorhal/usbd_ioreq.h b/embed/trezorhal/usbd_ioreq.h
similarity index 100%
rename from micropython/trezorhal/usbd_ioreq.h
rename to embed/trezorhal/usbd_ioreq.h
diff --git a/micropython/unix/Makefile b/embed/unix/Makefile
similarity index 100%
rename from micropython/unix/Makefile
rename to embed/unix/Makefile
diff --git a/micropython/unix/common.c b/embed/unix/common.c
similarity index 100%
rename from micropython/unix/common.c
rename to embed/unix/common.c
diff --git a/micropython/unix/common.h b/embed/unix/common.h
similarity index 100%
rename from micropython/unix/common.h
rename to embed/unix/common.h
diff --git a/micropython/unix/mpconfigport.h b/embed/unix/mpconfigport.h
similarity index 100%
rename from micropython/unix/mpconfigport.h
rename to embed/unix/mpconfigport.h
diff --git a/micropython/unix/options.h b/embed/unix/options.h
similarity index 100%
rename from micropython/unix/options.h
rename to embed/unix/options.h
diff --git a/micropython/unix/touch.c b/embed/unix/touch.c
similarity index 100%
rename from micropython/unix/touch.c
rename to embed/unix/touch.c