diff --git a/core/SConscript.boardloader b/core/SConscript.boardloader
index 57eec7e7c4..9a325b829f 100644
--- a/core/SConscript.boardloader
+++ b/core/SConscript.boardloader
@@ -53,10 +53,10 @@ CPPPATH_MOD += [
         'vendor/micropython/lib/uzlib',
 ]
 SOURCE_MOD += [
-    'embed/extmod/modtrezorui/display.c',
-    'embed/extmod/modtrezorui/colors.c',
-    'embed/extmod/modtrezorui/fonts/fonts.c',
-    'embed/extmod/modtrezorui/fonts/font_bitmap.c',
+    'embed/src/display.c',
+    'embed/src/colors.c',
+    'embed/src/fonts/fonts.c',
+    'embed/src/fonts/font_bitmap.c',
 ]
 
 SOURCE_STMHAL = [
@@ -141,6 +141,7 @@ env.Replace(
     LINKFLAGS='-T embed/boardloader/memory.ld -Wl,--gc-sections -Wl,-Map=build/boardloader/boardloader.map -Wl,--warn-common  -Wl,--print-memory-usage',
     CPPPATH=[
         'embed/boardloader',
+        'embed/src',
         'embed/trezorhal',
         'embed/extmod/modtrezorui',
         'vendor/micropython/stmhal',
diff --git a/core/SConscript.bootloader b/core/SConscript.bootloader
index 1fb1e98885..3135b6de49 100644
--- a/core/SConscript.bootloader
+++ b/core/SConscript.bootloader
@@ -75,11 +75,11 @@ CPPPATH_MOD += [
 ]
 
 SOURCE_MOD += [
-    'embed/extmod/modtrezorui/buffers.c',
-    'embed/extmod/modtrezorui/colors.c',
-    'embed/extmod/modtrezorui/display.c',
-    'embed/extmod/modtrezorui/fonts/fonts.c',
-    'embed/extmod/modtrezorui/fonts/font_bitmap.c',
+    'embed/src/buffers.c',
+    'embed/src/colors.c',
+    'embed/src/display.c',
+    'embed/src/fonts/fonts.c',
+    'embed/src/fonts/font_bitmap.c',
     'embed/extmod/modtrezorcrypto/rand.c',
     'vendor/micropython/lib/uzlib/adler32.c',
     'vendor/micropython/lib/uzlib/crc32.c',
@@ -204,6 +204,7 @@ env.Replace(
         'embed/bootloader',
         'embed/bootloader/nanopb',
         'embed/bootloader/protob',
+        'embed/src',
         'embed/trezorhal',
         'embed/extmod/modtrezorui',
         'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc',
diff --git a/core/SConscript.bootloader_ci b/core/SConscript.bootloader_ci
index 1d01b32939..a1f57db7f1 100644
--- a/core/SConscript.bootloader_ci
+++ b/core/SConscript.bootloader_ci
@@ -67,10 +67,10 @@ CPPPATH_MOD += [
         'vendor/micropython/lib/uzlib',
 ]
 SOURCE_MOD += [
-    'embed/extmod/modtrezorui/display.c',
-    'embed/extmod/modtrezorui/colors.c',
-    'embed/extmod/modtrezorui/fonts/fonts.c',
-    'embed/extmod/modtrezorui/fonts/font_bitmap.c',
+    'embed/src/display.c',
+    'embed/src/colors.c',
+    'embed/src/fonts/fonts.c',
+    'embed/src/fonts/font_bitmap.c',
     'embed/extmod/modtrezorcrypto/rand.c',
     'vendor/micropython/lib/uzlib/adler32.c',
     'vendor/micropython/lib/uzlib/crc32.c',
@@ -181,6 +181,7 @@ env.Replace(
         'embed/bootloader_ci',
         'embed/bootloader_ci/nanopb',
         'embed/bootloader_ci/protob',
+        'embed/src',
         'embed/trezorhal',
         'embed/extmod/modtrezorui',
         'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc',
diff --git a/core/SConscript.firmware b/core/SConscript.firmware
index 2d873f4900..98a289516d 100644
--- a/core/SConscript.firmware
+++ b/core/SConscript.firmware
@@ -177,11 +177,11 @@ CPPPATH_MOD += [
         'vendor/micropython/lib/uzlib',
 ]
 SOURCE_MOD += [
-    'embed/extmod/modtrezorui/buffers.c',
-    'embed/extmod/modtrezorui/colors.c',
-    'embed/extmod/modtrezorui/display.c',
-    'embed/extmod/modtrezorui/fonts/fonts.c',
-    'embed/extmod/modtrezorui/fonts/font_bitmap.c',
+    'embed/src/buffers.c',
+    'embed/src/colors.c',
+    'embed/src/display.c',
+    'embed/src/fonts/fonts.c',
+    'embed/src/fonts/font_bitmap.c',
     'embed/extmod/modtrezorui/modtrezorui.c',
     'vendor/micropython/lib/uzlib/adler32.c',
     'vendor/micropython/lib/uzlib/crc32.c',
@@ -479,6 +479,7 @@ env.Replace(
         '.',
         'embed/rust',
         'embed/firmware',
+        'embed/src',
         'embed/trezorhal',
         'embed/extmod/modtrezorui',
         'vendor/micropython',
diff --git a/core/SConscript.prodtest b/core/SConscript.prodtest
index 64fccf4a6f..1d25e740f5 100644
--- a/core/SConscript.prodtest
+++ b/core/SConscript.prodtest
@@ -44,11 +44,11 @@ CPPPATH_MOD += [
 ]
 
 SOURCE_MOD += [
-    'embed/extmod/modtrezorui/display.c',
-    'embed/extmod/modtrezorui/colors.c',
-    'embed/extmod/modtrezorui/fonts/fonts.c',
-    'embed/extmod/modtrezorui/fonts/font_bitmap.c',
-    'embed/extmod/modtrezorui/qr-code-generator/qrcodegen.c',
+    'embed/src/display.c',
+    'embed/src/colors.c',
+    'embed/src/fonts/fonts.c',
+    'embed/src/fonts/font_bitmap.c',
+    'embed/src/qr-code-generator/qrcodegen.c',
     'vendor/micropython/lib/uzlib/adler32.c',
     'vendor/micropython/lib/uzlib/crc32.c',
     'vendor/micropython/lib/uzlib/tinflate.c',
@@ -150,6 +150,7 @@ env.Replace(
     LINKFLAGS='-T embed/prodtest/memory.ld -Wl,--gc-sections -Wl,-Map=build/prodtest/prodtest.map -Wl,--warn-common',
     CPPPATH=[
         'embed/prodtest',
+        'embed/src',
         'embed/trezorhal',
         'embed/extmod/modtrezorui',
         'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc',
diff --git a/core/SConscript.reflash b/core/SConscript.reflash
index a9c1c604ca..3457e7ded2 100644
--- a/core/SConscript.reflash
+++ b/core/SConscript.reflash
@@ -37,10 +37,10 @@ CPPPATH_MOD += [
         'vendor/micropython/lib/uzlib',
 ]
 SOURCE_MOD += [
-    'embed/extmod/modtrezorui/display.c',
-    'embed/extmod/modtrezorui/colors.c',
-    'embed/extmod/modtrezorui/fonts/fonts.c',
-    'embed/extmod/modtrezorui/fonts/font_bitmap.c',
+    'embed/src/display.c',
+    'embed/src/colors.c',
+    'embed/src/fonts/fonts.c',
+    'embed/src/fonts/font_bitmap.c',
     'vendor/micropython/lib/uzlib/adler32.c',
     'vendor/micropython/lib/uzlib/crc32.c',
     'vendor/micropython/lib/uzlib/tinflate.c',
@@ -141,6 +141,7 @@ env.Replace(
     LINKFLAGS='-T embed/reflash/memory.ld -Wl,--gc-sections -Wl,-Map=build/reflash/reflash.map -Wl,--warn-common',
     CPPPATH=[
         'embed/reflash',
+        'embed/src',
         'embed/trezorhal',
         'embed/extmod/modtrezorui',
         'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc',
diff --git a/core/SConscript.unix b/core/SConscript.unix
index babae416f3..9f57a8abcc 100644
--- a/core/SConscript.unix
+++ b/core/SConscript.unix
@@ -170,11 +170,11 @@ CPPPATH_MOD += [
         'vendor/micropython/lib/uzlib',
 ]
 SOURCE_MOD += [
-    'embed/extmod/modtrezorui/buffers.c',
-    'embed/extmod/modtrezorui/colors.c',
-    'embed/extmod/modtrezorui/display.c',
-    'embed/extmod/modtrezorui/fonts/fonts.c',
-    'embed/extmod/modtrezorui/fonts/font_bitmap.c',
+    'embed/src/buffers.c',
+    'embed/src/colors.c',
+    'embed/src/display.c',
+    'embed/src/fonts/fonts.c',
+    'embed/src/fonts/font_bitmap.c',
     'embed/extmod/modtrezorui/modtrezorui.c',
     'vendor/micropython/lib/uzlib/adler32.c',
     'vendor/micropython/lib/uzlib/crc32.c',
@@ -442,6 +442,7 @@ env.Replace(
     CPPPATH=[
         '.',
         'embed/rust',
+        'embed/src',
         'embed/unix',
         'embed/extmod/modtrezorui',
         'vendor/micropython',
diff --git a/core/embed/rust/build.rs b/core/embed/rust/build.rs
index fc87366261..e434142a32 100644
--- a/core/embed/rust/build.rs
+++ b/core/embed/rust/build.rs
@@ -75,7 +75,7 @@ fn prepare_bindings() -> bindgen::Builder {
         "-I../../../storage",
         "-I../../vendor/micropython",
         "-I../../vendor/micropython/lib/uzlib",
-        "-I../extmod/modtrezorui", // for display.h
+        "-I../src",
         format!("-DTREZOR_MODEL_{}", model()).as_str(),
         format!("-DTREZOR_BOARD=\"{}\"", board()).as_str(),
     ]);
diff --git a/core/embed/extmod/modtrezorui/buffers.c b/core/embed/src/buffers.c
similarity index 100%
rename from core/embed/extmod/modtrezorui/buffers.c
rename to core/embed/src/buffers.c
diff --git a/core/embed/extmod/modtrezorui/buffers.h b/core/embed/src/buffers.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/buffers.h
rename to core/embed/src/buffers.h
diff --git a/core/embed/extmod/modtrezorui/colors.c b/core/embed/src/colors.c
similarity index 100%
rename from core/embed/extmod/modtrezorui/colors.c
rename to core/embed/src/colors.c
diff --git a/core/embed/extmod/modtrezorui/colors.h b/core/embed/src/colors.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/colors.h
rename to core/embed/src/colors.h
diff --git a/core/embed/extmod/modtrezorui/display.c b/core/embed/src/display.c
similarity index 100%
rename from core/embed/extmod/modtrezorui/display.c
rename to core/embed/src/display.c
diff --git a/core/embed/extmod/modtrezorui/display.h b/core/embed/src/display.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/display.h
rename to core/embed/src/display.h
diff --git a/core/embed/extmod/modtrezorui/display_interface.h b/core/embed/src/display_interface.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/display_interface.h
rename to core/embed/src/display_interface.h
diff --git a/core/embed/extmod/modtrezorui/fonts/font_bitmap.c b/core/embed/src/fonts/font_bitmap.c
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_bitmap.c
rename to core/embed/src/fonts/font_bitmap.c
diff --git a/core/embed/extmod/modtrezorui/fonts/font_bitmap.h b/core/embed/src/fonts/font_bitmap.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_bitmap.h
rename to core/embed/src/fonts/font_bitmap.h
diff --git a/core/embed/extmod/modtrezorui/fonts/font_pixeloperator_bold_8.c b/core/embed/src/fonts/font_pixeloperator_bold_8.c
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_pixeloperator_bold_8.c
rename to core/embed/src/fonts/font_pixeloperator_bold_8.c
diff --git a/core/embed/extmod/modtrezorui/fonts/font_pixeloperator_bold_8.h b/core/embed/src/fonts/font_pixeloperator_bold_8.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_pixeloperator_bold_8.h
rename to core/embed/src/fonts/font_pixeloperator_bold_8.h
diff --git a/core/embed/extmod/modtrezorui/fonts/font_pixeloperator_regular_8.c b/core/embed/src/fonts/font_pixeloperator_regular_8.c
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_pixeloperator_regular_8.c
rename to core/embed/src/fonts/font_pixeloperator_regular_8.c
diff --git a/core/embed/extmod/modtrezorui/fonts/font_pixeloperator_regular_8.h b/core/embed/src/fonts/font_pixeloperator_regular_8.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_pixeloperator_regular_8.h
rename to core/embed/src/fonts/font_pixeloperator_regular_8.h
diff --git a/core/embed/extmod/modtrezorui/fonts/font_pixeloperatormono_regular_8.c b/core/embed/src/fonts/font_pixeloperatormono_regular_8.c
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_pixeloperatormono_regular_8.c
rename to core/embed/src/fonts/font_pixeloperatormono_regular_8.c
diff --git a/core/embed/extmod/modtrezorui/fonts/font_pixeloperatormono_regular_8.h b/core/embed/src/fonts/font_pixeloperatormono_regular_8.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_pixeloperatormono_regular_8.h
rename to core/embed/src/fonts/font_pixeloperatormono_regular_8.h
diff --git a/core/embed/extmod/modtrezorui/fonts/font_roboto_bold_20.c b/core/embed/src/fonts/font_roboto_bold_20.c
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_roboto_bold_20.c
rename to core/embed/src/fonts/font_roboto_bold_20.c
diff --git a/core/embed/extmod/modtrezorui/fonts/font_roboto_bold_20.h b/core/embed/src/fonts/font_roboto_bold_20.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_roboto_bold_20.h
rename to core/embed/src/fonts/font_roboto_bold_20.h
diff --git a/core/embed/extmod/modtrezorui/fonts/font_roboto_regular_20.c b/core/embed/src/fonts/font_roboto_regular_20.c
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_roboto_regular_20.c
rename to core/embed/src/fonts/font_roboto_regular_20.c
diff --git a/core/embed/extmod/modtrezorui/fonts/font_roboto_regular_20.h b/core/embed/src/fonts/font_roboto_regular_20.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_roboto_regular_20.h
rename to core/embed/src/fonts/font_roboto_regular_20.h
diff --git a/core/embed/extmod/modtrezorui/fonts/font_robotomono_regular_20.c b/core/embed/src/fonts/font_robotomono_regular_20.c
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_robotomono_regular_20.c
rename to core/embed/src/fonts/font_robotomono_regular_20.c
diff --git a/core/embed/extmod/modtrezorui/fonts/font_robotomono_regular_20.h b/core/embed/src/fonts/font_robotomono_regular_20.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_robotomono_regular_20.h
rename to core/embed/src/fonts/font_robotomono_regular_20.h
diff --git a/core/embed/extmod/modtrezorui/fonts/font_tthoves_bold_17.c b/core/embed/src/fonts/font_tthoves_bold_17.c
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_tthoves_bold_17.c
rename to core/embed/src/fonts/font_tthoves_bold_17.c
diff --git a/core/embed/extmod/modtrezorui/fonts/font_tthoves_bold_17.h b/core/embed/src/fonts/font_tthoves_bold_17.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_tthoves_bold_17.h
rename to core/embed/src/fonts/font_tthoves_bold_17.h
diff --git a/core/embed/extmod/modtrezorui/fonts/font_tthoves_demibold_21.c b/core/embed/src/fonts/font_tthoves_demibold_21.c
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_tthoves_demibold_21.c
rename to core/embed/src/fonts/font_tthoves_demibold_21.c
diff --git a/core/embed/extmod/modtrezorui/fonts/font_tthoves_demibold_21.h b/core/embed/src/fonts/font_tthoves_demibold_21.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_tthoves_demibold_21.h
rename to core/embed/src/fonts/font_tthoves_demibold_21.h
diff --git a/core/embed/extmod/modtrezorui/fonts/font_tthoves_regular_21.c b/core/embed/src/fonts/font_tthoves_regular_21.c
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_tthoves_regular_21.c
rename to core/embed/src/fonts/font_tthoves_regular_21.c
diff --git a/core/embed/extmod/modtrezorui/fonts/font_tthoves_regular_21.h b/core/embed/src/fonts/font_tthoves_regular_21.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/font_tthoves_regular_21.h
rename to core/embed/src/fonts/font_tthoves_regular_21.h
diff --git a/core/embed/extmod/modtrezorui/fonts/fonts.c b/core/embed/src/fonts/fonts.c
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/fonts.c
rename to core/embed/src/fonts/fonts.c
diff --git a/core/embed/extmod/modtrezorui/fonts/fonts.h b/core/embed/src/fonts/fonts.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/fonts/fonts.h
rename to core/embed/src/fonts/fonts.h
diff --git a/core/embed/extmod/modtrezorui/loader_R.h b/core/embed/src/loader_R.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/loader_R.h
rename to core/embed/src/loader_R.h
diff --git a/core/embed/extmod/modtrezorui/loader_T.h b/core/embed/src/loader_T.h
similarity index 100%
rename from core/embed/extmod/modtrezorui/loader_T.h
rename to core/embed/src/loader_T.h
diff --git a/core/embed/extmod/modtrezorui/qr-code-generator b/core/embed/src/qr-code-generator
similarity index 100%
rename from core/embed/extmod/modtrezorui/qr-code-generator
rename to core/embed/src/qr-code-generator
diff --git a/core/site_scons/tools.py b/core/site_scons/tools.py
index e5f2d17eae..42b33578c6 100644
--- a/core/site_scons/tools.py
+++ b/core/site_scons/tools.py
@@ -11,7 +11,7 @@ def add_font(font_name, font, defines, sources):
             'TREZOR_FONT_' + font_name + '_ENABLE=' + font,
             'TREZOR_FONT_' + font_name + '_INCLUDE=\\"' + font.lower() + '.h\\"',
         ]
-        sourcefile = 'embed/extmod/modtrezorui/fonts/' + font.lower() + '.c'
+        sourcefile = 'embed/src/fonts/' + font.lower() + '.c'
         if sourcefile not in sources:
             sources.append(sourcefile)