diff --git a/lib/embed/__errno.c b/shared/libc/__errno.c
similarity index 100%
rename from lib/embed/__errno.c
rename to shared/libc/__errno.c
diff --git a/lib/embed/abort_.c b/shared/libc/abort_.c
similarity index 100%
rename from lib/embed/abort_.c
rename to shared/libc/abort_.c
diff --git a/lib/utils/printf.c b/shared/libc/printf.c
similarity index 100%
rename from lib/utils/printf.c
rename to shared/libc/printf.c
diff --git a/lib/libc/string0.c b/shared/libc/string0.c
similarity index 100%
rename from lib/libc/string0.c
rename to shared/libc/string0.c
diff --git a/lib/memzip/README.md b/shared/memzip/README.md
similarity index 100%
rename from lib/memzip/README.md
rename to shared/memzip/README.md
diff --git a/lib/memzip/import.c b/shared/memzip/import.c
similarity index 100%
rename from lib/memzip/import.c
rename to shared/memzip/import.c
diff --git a/lib/memzip/lexermemzip.c b/shared/memzip/lexermemzip.c
similarity index 100%
rename from lib/memzip/lexermemzip.c
rename to shared/memzip/lexermemzip.c
diff --git a/lib/memzip/make-memzip.py b/shared/memzip/make-memzip.py
similarity index 100%
rename from lib/memzip/make-memzip.py
rename to shared/memzip/make-memzip.py
diff --git a/lib/memzip/memzip.c b/shared/memzip/memzip.c
similarity index 100%
rename from lib/memzip/memzip.c
rename to shared/memzip/memzip.c
diff --git a/lib/memzip/memzip.h b/shared/memzip/memzip.h
similarity index 100%
rename from lib/memzip/memzip.h
rename to shared/memzip/memzip.h
diff --git a/lib/netutils/dhcpserver.c b/shared/netutils/dhcpserver.c
similarity index 100%
rename from lib/netutils/dhcpserver.c
rename to shared/netutils/dhcpserver.c
diff --git a/lib/netutils/dhcpserver.h b/shared/netutils/dhcpserver.h
similarity index 100%
rename from lib/netutils/dhcpserver.h
rename to shared/netutils/dhcpserver.h
diff --git a/lib/netutils/netutils.c b/shared/netutils/netutils.c
similarity index 100%
rename from lib/netutils/netutils.c
rename to shared/netutils/netutils.c
diff --git a/lib/netutils/netutils.h b/shared/netutils/netutils.h
similarity index 100%
rename from lib/netutils/netutils.h
rename to shared/netutils/netutils.h
diff --git a/lib/netutils/trace.c b/shared/netutils/trace.c
similarity index 100%
rename from lib/netutils/trace.c
rename to shared/netutils/trace.c
diff --git a/lib/mp-readline/readline.c b/shared/readline/readline.c
similarity index 100%
rename from lib/mp-readline/readline.c
rename to shared/readline/readline.c
diff --git a/lib/mp-readline/readline.h b/shared/readline/readline.h
similarity index 100%
rename from lib/mp-readline/readline.h
rename to shared/readline/readline.h
diff --git a/lib/utils/gchelper.h b/shared/runtime/gchelper.h
similarity index 100%
rename from lib/utils/gchelper.h
rename to shared/runtime/gchelper.h
diff --git a/lib/utils/gchelper_generic.c b/shared/runtime/gchelper_generic.c
similarity index 100%
rename from lib/utils/gchelper_generic.c
rename to shared/runtime/gchelper_generic.c
diff --git a/lib/utils/gchelper_m0.s b/shared/runtime/gchelper_m0.s
similarity index 100%
rename from lib/utils/gchelper_m0.s
rename to shared/runtime/gchelper_m0.s
diff --git a/lib/utils/gchelper_m3.s b/shared/runtime/gchelper_m3.s
similarity index 100%
rename from lib/utils/gchelper_m3.s
rename to shared/runtime/gchelper_m3.s
diff --git a/lib/utils/gchelper_native.c b/shared/runtime/gchelper_native.c
similarity index 100%
rename from lib/utils/gchelper_native.c
rename to shared/runtime/gchelper_native.c
diff --git a/lib/utils/interrupt_char.c b/shared/runtime/interrupt_char.c
similarity index 100%
rename from lib/utils/interrupt_char.c
rename to shared/runtime/interrupt_char.c
diff --git a/lib/utils/interrupt_char.h b/shared/runtime/interrupt_char.h
similarity index 100%
rename from lib/utils/interrupt_char.h
rename to shared/runtime/interrupt_char.h
diff --git a/lib/utils/mpirq.c b/shared/runtime/mpirq.c
similarity index 100%
rename from lib/utils/mpirq.c
rename to shared/runtime/mpirq.c
diff --git a/lib/utils/mpirq.h b/shared/runtime/mpirq.h
similarity index 100%
rename from lib/utils/mpirq.h
rename to shared/runtime/mpirq.h
diff --git a/lib/utils/pyexec.c b/shared/runtime/pyexec.c
similarity index 100%
rename from lib/utils/pyexec.c
rename to shared/runtime/pyexec.c
diff --git a/lib/utils/pyexec.h b/shared/runtime/pyexec.h
similarity index 100%
rename from lib/utils/pyexec.h
rename to shared/runtime/pyexec.h
diff --git a/lib/utils/semihosting.c b/shared/runtime/semihosting.c
similarity index 100%
rename from lib/utils/semihosting.c
rename to shared/runtime/semihosting.c
diff --git a/lib/utils/semihosting.h b/shared/runtime/semihosting.h
similarity index 100%
rename from lib/utils/semihosting.h
rename to shared/runtime/semihosting.h
diff --git a/lib/utils/stdout_helpers.c b/shared/runtime/stdout_helpers.c
similarity index 100%
rename from lib/utils/stdout_helpers.c
rename to shared/runtime/stdout_helpers.c
diff --git a/lib/utils/sys_stdio_mphal.c b/shared/runtime/sys_stdio_mphal.c
similarity index 100%
rename from lib/utils/sys_stdio_mphal.c
rename to shared/runtime/sys_stdio_mphal.c
diff --git a/lib/timeutils/timeutils.c b/shared/timeutils/timeutils.c
similarity index 100%
rename from lib/timeutils/timeutils.c
rename to shared/timeutils/timeutils.c
diff --git a/lib/timeutils/timeutils.h b/shared/timeutils/timeutils.h
similarity index 100%
rename from lib/timeutils/timeutils.h
rename to shared/timeutils/timeutils.h
diff --git a/lib/upytesthelper/upytesthelper.c b/shared/upytesthelper/upytesthelper.c
similarity index 100%
rename from lib/upytesthelper/upytesthelper.c
rename to shared/upytesthelper/upytesthelper.c
diff --git a/lib/upytesthelper/upytesthelper.h b/shared/upytesthelper/upytesthelper.h
similarity index 100%
rename from lib/upytesthelper/upytesthelper.h
rename to shared/upytesthelper/upytesthelper.h