diff --git a/system/include/libc/aio.h b/system/lib/libc/musl/include/aio.h
similarity index 100%
rename from system/include/libc/aio.h
rename to system/lib/libc/musl/include/aio.h
diff --git a/system/include/libc/alloca.h b/system/lib/libc/musl/include/alloca.h
similarity index 100%
rename from system/include/libc/alloca.h
rename to system/lib/libc/musl/include/alloca.h
diff --git a/system/include/libc/alltypes.h.in b/system/lib/libc/musl/include/alltypes.h.in
similarity index 100%
rename from system/include/libc/alltypes.h.in
rename to system/lib/libc/musl/include/alltypes.h.in
diff --git a/system/include/libc/ar.h b/system/lib/libc/musl/include/ar.h
similarity index 100%
rename from system/include/libc/ar.h
rename to system/lib/libc/musl/include/ar.h
diff --git a/system/include/libc/arpa/ftp.h b/system/lib/libc/musl/include/arpa/ftp.h
similarity index 100%
rename from system/include/libc/arpa/ftp.h
rename to system/lib/libc/musl/include/arpa/ftp.h
diff --git a/system/include/libc/arpa/inet.h b/system/lib/libc/musl/include/arpa/inet.h
similarity index 100%
rename from system/include/libc/arpa/inet.h
rename to system/lib/libc/musl/include/arpa/inet.h
diff --git a/system/include/libc/arpa/nameser.h b/system/lib/libc/musl/include/arpa/nameser.h
similarity index 100%
rename from system/include/libc/arpa/nameser.h
rename to system/lib/libc/musl/include/arpa/nameser.h
diff --git a/system/include/libc/arpa/nameser_compat.h b/system/lib/libc/musl/include/arpa/nameser_compat.h
similarity index 100%
rename from system/include/libc/arpa/nameser_compat.h
rename to system/lib/libc/musl/include/arpa/nameser_compat.h
diff --git a/system/include/libc/arpa/telnet.h b/system/lib/libc/musl/include/arpa/telnet.h
similarity index 100%
rename from system/include/libc/arpa/telnet.h
rename to system/lib/libc/musl/include/arpa/telnet.h
diff --git a/system/include/libc/arpa/tftp.h b/system/lib/libc/musl/include/arpa/tftp.h
similarity index 100%
rename from system/include/libc/arpa/tftp.h
rename to system/lib/libc/musl/include/arpa/tftp.h
diff --git a/system/include/libc/assert.h b/system/lib/libc/musl/include/assert.h
similarity index 100%
rename from system/include/libc/assert.h
rename to system/lib/libc/musl/include/assert.h
diff --git a/system/include/libc/byteswap.h b/system/lib/libc/musl/include/byteswap.h
similarity index 100%
rename from system/include/libc/byteswap.h
rename to system/lib/libc/musl/include/byteswap.h
diff --git a/system/include/libc/complex.h b/system/lib/libc/musl/include/complex.h
similarity index 100%
rename from system/include/libc/complex.h
rename to system/lib/libc/musl/include/complex.h
diff --git a/system/include/libc/cpio.h b/system/lib/libc/musl/include/cpio.h
similarity index 100%
rename from system/include/libc/cpio.h
rename to system/lib/libc/musl/include/cpio.h
diff --git a/system/include/libc/crypt.h b/system/lib/libc/musl/include/crypt.h
similarity index 100%
rename from system/include/libc/crypt.h
rename to system/lib/libc/musl/include/crypt.h
diff --git a/system/include/libc/ctype.h b/system/lib/libc/musl/include/ctype.h
similarity index 100%
rename from system/include/libc/ctype.h
rename to system/lib/libc/musl/include/ctype.h
diff --git a/system/include/libc/dirent.h b/system/lib/libc/musl/include/dirent.h
similarity index 100%
rename from system/include/libc/dirent.h
rename to system/lib/libc/musl/include/dirent.h
diff --git a/system/include/libc/dlfcn.h b/system/lib/libc/musl/include/dlfcn.h
similarity index 100%
rename from system/include/libc/dlfcn.h
rename to system/lib/libc/musl/include/dlfcn.h
diff --git a/system/include/libc/elf.h b/system/lib/libc/musl/include/elf.h
similarity index 100%
rename from system/include/libc/elf.h
rename to system/lib/libc/musl/include/elf.h
diff --git a/system/include/libc/endian.h b/system/lib/libc/musl/include/endian.h
similarity index 100%
rename from system/include/libc/endian.h
rename to system/lib/libc/musl/include/endian.h
diff --git a/system/include/libc/err.h b/system/lib/libc/musl/include/err.h
similarity index 100%
rename from system/include/libc/err.h
rename to system/lib/libc/musl/include/err.h
diff --git a/system/include/libc/errno.h b/system/lib/libc/musl/include/errno.h
similarity index 100%
rename from system/include/libc/errno.h
rename to system/lib/libc/musl/include/errno.h
diff --git a/system/include/libc/fcntl.h b/system/lib/libc/musl/include/fcntl.h
similarity index 100%
rename from system/include/libc/fcntl.h
rename to system/lib/libc/musl/include/fcntl.h
diff --git a/system/include/libc/features.h b/system/lib/libc/musl/include/features.h
similarity index 100%
rename from system/include/libc/features.h
rename to system/lib/libc/musl/include/features.h
diff --git a/system/include/libc/fenv.h b/system/lib/libc/musl/include/fenv.h
similarity index 100%
rename from system/include/libc/fenv.h
rename to system/lib/libc/musl/include/fenv.h
diff --git a/system/include/libc/float.h b/system/lib/libc/musl/include/float.h
similarity index 100%
rename from system/include/libc/float.h
rename to system/lib/libc/musl/include/float.h
diff --git a/system/include/libc/fmtmsg.h b/system/lib/libc/musl/include/fmtmsg.h
similarity index 100%
rename from system/include/libc/fmtmsg.h
rename to system/lib/libc/musl/include/fmtmsg.h
diff --git a/system/include/libc/fnmatch.h b/system/lib/libc/musl/include/fnmatch.h
similarity index 100%
rename from system/include/libc/fnmatch.h
rename to system/lib/libc/musl/include/fnmatch.h
diff --git a/system/include/libc/ftw.h b/system/lib/libc/musl/include/ftw.h
similarity index 100%
rename from system/include/libc/ftw.h
rename to system/lib/libc/musl/include/ftw.h
diff --git a/system/include/libc/getopt.h b/system/lib/libc/musl/include/getopt.h
similarity index 100%
rename from system/include/libc/getopt.h
rename to system/lib/libc/musl/include/getopt.h
diff --git a/system/include/libc/glob.h b/system/lib/libc/musl/include/glob.h
similarity index 100%
rename from system/include/libc/glob.h
rename to system/lib/libc/musl/include/glob.h
diff --git a/system/include/libc/grp.h b/system/lib/libc/musl/include/grp.h
similarity index 100%
rename from system/include/libc/grp.h
rename to system/lib/libc/musl/include/grp.h
diff --git a/system/include/libc/iconv.h b/system/lib/libc/musl/include/iconv.h
similarity index 100%
rename from system/include/libc/iconv.h
rename to system/lib/libc/musl/include/iconv.h
diff --git a/system/include/libc/ifaddrs.h b/system/lib/libc/musl/include/ifaddrs.h
similarity index 100%
rename from system/include/libc/ifaddrs.h
rename to system/lib/libc/musl/include/ifaddrs.h
diff --git a/system/include/libc/inttypes.h b/system/lib/libc/musl/include/inttypes.h
similarity index 100%
rename from system/include/libc/inttypes.h
rename to system/lib/libc/musl/include/inttypes.h
diff --git a/system/include/libc/iso646.h b/system/lib/libc/musl/include/iso646.h
similarity index 100%
rename from system/include/libc/iso646.h
rename to system/lib/libc/musl/include/iso646.h
diff --git a/system/include/libc/langinfo.h b/system/lib/libc/musl/include/langinfo.h
similarity index 100%
rename from system/include/libc/langinfo.h
rename to system/lib/libc/musl/include/langinfo.h
diff --git a/system/include/libc/lastlog.h b/system/lib/libc/musl/include/lastlog.h
similarity index 100%
rename from system/include/libc/lastlog.h
rename to system/lib/libc/musl/include/lastlog.h
diff --git a/system/include/libc/libgen.h b/system/lib/libc/musl/include/libgen.h
similarity index 100%
rename from system/include/libc/libgen.h
rename to system/lib/libc/musl/include/libgen.h
diff --git a/system/include/libc/libintl.h b/system/lib/libc/musl/include/libintl.h
similarity index 100%
rename from system/include/libc/libintl.h
rename to system/lib/libc/musl/include/libintl.h
diff --git a/system/include/libc/limits.h b/system/lib/libc/musl/include/limits.h
similarity index 100%
rename from system/include/libc/limits.h
rename to system/lib/libc/musl/include/limits.h
diff --git a/system/include/libc/link.h b/system/lib/libc/musl/include/link.h
similarity index 100%
rename from system/include/libc/link.h
rename to system/lib/libc/musl/include/link.h
diff --git a/system/include/libc/locale.h b/system/lib/libc/musl/include/locale.h
similarity index 100%
rename from system/include/libc/locale.h
rename to system/lib/libc/musl/include/locale.h
diff --git a/system/include/libc/malloc.h b/system/lib/libc/musl/include/malloc.h
similarity index 100%
rename from system/include/libc/malloc.h
rename to system/lib/libc/musl/include/malloc.h
diff --git a/system/include/libc/math.h b/system/lib/libc/musl/include/math.h
similarity index 100%
rename from system/include/libc/math.h
rename to system/lib/libc/musl/include/math.h
diff --git a/system/include/libc/memory.h b/system/lib/libc/musl/include/memory.h
similarity index 100%
rename from system/include/libc/memory.h
rename to system/lib/libc/musl/include/memory.h
diff --git a/system/include/libc/mntent.h b/system/lib/libc/musl/include/mntent.h
similarity index 100%
rename from system/include/libc/mntent.h
rename to system/lib/libc/musl/include/mntent.h
diff --git a/system/include/libc/monetary.h b/system/lib/libc/musl/include/monetary.h
similarity index 100%
rename from system/include/libc/monetary.h
rename to system/lib/libc/musl/include/monetary.h
diff --git a/system/include/libc/mqueue.h b/system/lib/libc/musl/include/mqueue.h
similarity index 100%
rename from system/include/libc/mqueue.h
rename to system/lib/libc/musl/include/mqueue.h
diff --git a/system/include/libc/net/ethernet.h b/system/lib/libc/musl/include/net/ethernet.h
similarity index 100%
rename from system/include/libc/net/ethernet.h
rename to system/lib/libc/musl/include/net/ethernet.h
diff --git a/system/include/libc/net/if.h b/system/lib/libc/musl/include/net/if.h
similarity index 100%
rename from system/include/libc/net/if.h
rename to system/lib/libc/musl/include/net/if.h
diff --git a/system/include/libc/net/if_arp.h b/system/lib/libc/musl/include/net/if_arp.h
similarity index 100%
rename from system/include/libc/net/if_arp.h
rename to system/lib/libc/musl/include/net/if_arp.h
diff --git a/system/include/libc/net/route.h b/system/lib/libc/musl/include/net/route.h
similarity index 100%
rename from system/include/libc/net/route.h
rename to system/lib/libc/musl/include/net/route.h
diff --git a/system/include/libc/netdb.h b/system/lib/libc/musl/include/netdb.h
similarity index 100%
rename from system/include/libc/netdb.h
rename to system/lib/libc/musl/include/netdb.h
diff --git a/system/include/libc/netinet/ether.h b/system/lib/libc/musl/include/netinet/ether.h
similarity index 100%
rename from system/include/libc/netinet/ether.h
rename to system/lib/libc/musl/include/netinet/ether.h
diff --git a/system/include/libc/netinet/icmp6.h b/system/lib/libc/musl/include/netinet/icmp6.h
similarity index 100%
rename from system/include/libc/netinet/icmp6.h
rename to system/lib/libc/musl/include/netinet/icmp6.h
diff --git a/system/include/libc/netinet/if_ether.h b/system/lib/libc/musl/include/netinet/if_ether.h
similarity index 100%
rename from system/include/libc/netinet/if_ether.h
rename to system/lib/libc/musl/include/netinet/if_ether.h
diff --git a/system/include/libc/netinet/igmp.h b/system/lib/libc/musl/include/netinet/igmp.h
similarity index 100%
rename from system/include/libc/netinet/igmp.h
rename to system/lib/libc/musl/include/netinet/igmp.h
diff --git a/system/include/libc/netinet/in.h b/system/lib/libc/musl/include/netinet/in.h
similarity index 100%
rename from system/include/libc/netinet/in.h
rename to system/lib/libc/musl/include/netinet/in.h
diff --git a/system/include/libc/netinet/in_systm.h b/system/lib/libc/musl/include/netinet/in_systm.h
similarity index 100%
rename from system/include/libc/netinet/in_systm.h
rename to system/lib/libc/musl/include/netinet/in_systm.h
diff --git a/system/include/libc/netinet/ip.h b/system/lib/libc/musl/include/netinet/ip.h
similarity index 100%
rename from system/include/libc/netinet/ip.h
rename to system/lib/libc/musl/include/netinet/ip.h
diff --git a/system/include/libc/netinet/ip6.h b/system/lib/libc/musl/include/netinet/ip6.h
similarity index 100%
rename from system/include/libc/netinet/ip6.h
rename to system/lib/libc/musl/include/netinet/ip6.h
diff --git a/system/include/libc/netinet/ip_icmp.h b/system/lib/libc/musl/include/netinet/ip_icmp.h
similarity index 100%
rename from system/include/libc/netinet/ip_icmp.h
rename to system/lib/libc/musl/include/netinet/ip_icmp.h
diff --git a/system/include/libc/netinet/tcp.h b/system/lib/libc/musl/include/netinet/tcp.h
similarity index 100%
rename from system/include/libc/netinet/tcp.h
rename to system/lib/libc/musl/include/netinet/tcp.h
diff --git a/system/include/libc/netinet/udp.h b/system/lib/libc/musl/include/netinet/udp.h
similarity index 100%
rename from system/include/libc/netinet/udp.h
rename to system/lib/libc/musl/include/netinet/udp.h
diff --git a/system/include/libc/netpacket/packet.h b/system/lib/libc/musl/include/netpacket/packet.h
similarity index 100%
rename from system/include/libc/netpacket/packet.h
rename to system/lib/libc/musl/include/netpacket/packet.h
diff --git a/system/include/libc/nl_types.h b/system/lib/libc/musl/include/nl_types.h
similarity index 100%
rename from system/include/libc/nl_types.h
rename to system/lib/libc/musl/include/nl_types.h
diff --git a/system/include/libc/paths.h b/system/lib/libc/musl/include/paths.h
similarity index 100%
rename from system/include/libc/paths.h
rename to system/lib/libc/musl/include/paths.h
diff --git a/system/include/libc/poll.h b/system/lib/libc/musl/include/poll.h
similarity index 100%
rename from system/include/libc/poll.h
rename to system/lib/libc/musl/include/poll.h
diff --git a/system/include/libc/pthread.h b/system/lib/libc/musl/include/pthread.h
similarity index 100%
rename from system/include/libc/pthread.h
rename to system/lib/libc/musl/include/pthread.h
diff --git a/system/include/libc/pty.h b/system/lib/libc/musl/include/pty.h
similarity index 100%
rename from system/include/libc/pty.h
rename to system/lib/libc/musl/include/pty.h
diff --git a/system/include/libc/pwd.h b/system/lib/libc/musl/include/pwd.h
similarity index 100%
rename from system/include/libc/pwd.h
rename to system/lib/libc/musl/include/pwd.h
diff --git a/system/include/libc/readme.txt b/system/lib/libc/musl/include/readme.txt
similarity index 100%
rename from system/include/libc/readme.txt
rename to system/lib/libc/musl/include/readme.txt
diff --git a/system/include/libc/regex.h b/system/lib/libc/musl/include/regex.h
similarity index 100%
rename from system/include/libc/regex.h
rename to system/lib/libc/musl/include/regex.h
diff --git a/system/include/libc/resolv.h b/system/lib/libc/musl/include/resolv.h
similarity index 100%
rename from system/include/libc/resolv.h
rename to system/lib/libc/musl/include/resolv.h
diff --git a/system/include/libc/sched.h b/system/lib/libc/musl/include/sched.h
similarity index 100%
rename from system/include/libc/sched.h
rename to system/lib/libc/musl/include/sched.h
diff --git a/system/include/libc/scsi/scsi.h b/system/lib/libc/musl/include/scsi/scsi.h
similarity index 100%
rename from system/include/libc/scsi/scsi.h
rename to system/lib/libc/musl/include/scsi/scsi.h
diff --git a/system/include/libc/scsi/scsi_ioctl.h b/system/lib/libc/musl/include/scsi/scsi_ioctl.h
similarity index 100%
rename from system/include/libc/scsi/scsi_ioctl.h
rename to system/lib/libc/musl/include/scsi/scsi_ioctl.h
diff --git a/system/include/libc/scsi/sg.h b/system/lib/libc/musl/include/scsi/sg.h
similarity index 100%
rename from system/include/libc/scsi/sg.h
rename to system/lib/libc/musl/include/scsi/sg.h
diff --git a/system/include/libc/search.h b/system/lib/libc/musl/include/search.h
similarity index 100%
rename from system/include/libc/search.h
rename to system/lib/libc/musl/include/search.h
diff --git a/system/include/libc/semaphore.h b/system/lib/libc/musl/include/semaphore.h
similarity index 100%
rename from system/include/libc/semaphore.h
rename to system/lib/libc/musl/include/semaphore.h
diff --git a/system/include/libc/setjmp.h b/system/lib/libc/musl/include/setjmp.h
similarity index 100%
rename from system/include/libc/setjmp.h
rename to system/lib/libc/musl/include/setjmp.h
diff --git a/system/include/libc/shadow.h b/system/lib/libc/musl/include/shadow.h
similarity index 100%
rename from system/include/libc/shadow.h
rename to system/lib/libc/musl/include/shadow.h
diff --git a/system/include/libc/signal.h b/system/lib/libc/musl/include/signal.h
similarity index 100%
rename from system/include/libc/signal.h
rename to system/lib/libc/musl/include/signal.h
diff --git a/system/include/libc/spawn.h b/system/lib/libc/musl/include/spawn.h
similarity index 100%
rename from system/include/libc/spawn.h
rename to system/lib/libc/musl/include/spawn.h
diff --git a/system/include/libc/stdalign.h b/system/lib/libc/musl/include/stdalign.h
similarity index 100%
rename from system/include/libc/stdalign.h
rename to system/lib/libc/musl/include/stdalign.h
diff --git a/system/include/libc/stdarg.h b/system/lib/libc/musl/include/stdarg.h
similarity index 100%
rename from system/include/libc/stdarg.h
rename to system/lib/libc/musl/include/stdarg.h
diff --git a/system/include/libc/stdbool.h b/system/lib/libc/musl/include/stdbool.h
similarity index 100%
rename from system/include/libc/stdbool.h
rename to system/lib/libc/musl/include/stdbool.h
diff --git a/system/include/libc/stdc-predef.h b/system/lib/libc/musl/include/stdc-predef.h
similarity index 100%
rename from system/include/libc/stdc-predef.h
rename to system/lib/libc/musl/include/stdc-predef.h
diff --git a/system/include/libc/stddef.h b/system/lib/libc/musl/include/stddef.h
similarity index 100%
rename from system/include/libc/stddef.h
rename to system/lib/libc/musl/include/stddef.h
diff --git a/system/include/libc/stdint.h b/system/lib/libc/musl/include/stdint.h
similarity index 100%
rename from system/include/libc/stdint.h
rename to system/lib/libc/musl/include/stdint.h
diff --git a/system/include/libc/stdio.h b/system/lib/libc/musl/include/stdio.h
similarity index 100%
rename from system/include/libc/stdio.h
rename to system/lib/libc/musl/include/stdio.h
diff --git a/system/include/libc/stdio_ext.h b/system/lib/libc/musl/include/stdio_ext.h
similarity index 100%
rename from system/include/libc/stdio_ext.h
rename to system/lib/libc/musl/include/stdio_ext.h
diff --git a/system/include/libc/stdlib.h b/system/lib/libc/musl/include/stdlib.h
similarity index 100%
rename from system/include/libc/stdlib.h
rename to system/lib/libc/musl/include/stdlib.h
diff --git a/system/include/libc/stdnoreturn.h b/system/lib/libc/musl/include/stdnoreturn.h
similarity index 100%
rename from system/include/libc/stdnoreturn.h
rename to system/lib/libc/musl/include/stdnoreturn.h
diff --git a/system/include/libc/string.h b/system/lib/libc/musl/include/string.h
similarity index 100%
rename from system/include/libc/string.h
rename to system/lib/libc/musl/include/string.h
diff --git a/system/include/libc/strings.h b/system/lib/libc/musl/include/strings.h
similarity index 100%
rename from system/include/libc/strings.h
rename to system/lib/libc/musl/include/strings.h
diff --git a/system/include/libc/stropts.h b/system/lib/libc/musl/include/stropts.h
similarity index 100%
rename from system/include/libc/stropts.h
rename to system/lib/libc/musl/include/stropts.h
diff --git a/system/include/libc/sys/acct.h b/system/lib/libc/musl/include/sys/acct.h
similarity index 100%
rename from system/include/libc/sys/acct.h
rename to system/lib/libc/musl/include/sys/acct.h
diff --git a/system/include/libc/sys/auxv.h b/system/lib/libc/musl/include/sys/auxv.h
similarity index 100%
rename from system/include/libc/sys/auxv.h
rename to system/lib/libc/musl/include/sys/auxv.h
diff --git a/system/include/libc/sys/cachectl.h b/system/lib/libc/musl/include/sys/cachectl.h
similarity index 100%
rename from system/include/libc/sys/cachectl.h
rename to system/lib/libc/musl/include/sys/cachectl.h
diff --git a/system/include/libc/sys/dir.h b/system/lib/libc/musl/include/sys/dir.h
similarity index 100%
rename from system/include/libc/sys/dir.h
rename to system/lib/libc/musl/include/sys/dir.h
diff --git a/system/include/libc/sys/epoll.h b/system/lib/libc/musl/include/sys/epoll.h
similarity index 100%
rename from system/include/libc/sys/epoll.h
rename to system/lib/libc/musl/include/sys/epoll.h
diff --git a/system/include/libc/sys/errno.h b/system/lib/libc/musl/include/sys/errno.h
similarity index 100%
rename from system/include/libc/sys/errno.h
rename to system/lib/libc/musl/include/sys/errno.h
diff --git a/system/include/libc/sys/eventfd.h b/system/lib/libc/musl/include/sys/eventfd.h
similarity index 100%
rename from system/include/libc/sys/eventfd.h
rename to system/lib/libc/musl/include/sys/eventfd.h
diff --git a/system/include/libc/sys/fanotify.h b/system/lib/libc/musl/include/sys/fanotify.h
similarity index 100%
rename from system/include/libc/sys/fanotify.h
rename to system/lib/libc/musl/include/sys/fanotify.h
diff --git a/system/include/libc/sys/fcntl.h b/system/lib/libc/musl/include/sys/fcntl.h
similarity index 100%
rename from system/include/libc/sys/fcntl.h
rename to system/lib/libc/musl/include/sys/fcntl.h
diff --git a/system/include/libc/sys/file.h b/system/lib/libc/musl/include/sys/file.h
similarity index 100%
rename from system/include/libc/sys/file.h
rename to system/lib/libc/musl/include/sys/file.h
diff --git a/system/include/libc/sys/fsuid.h b/system/lib/libc/musl/include/sys/fsuid.h
similarity index 100%
rename from system/include/libc/sys/fsuid.h
rename to system/lib/libc/musl/include/sys/fsuid.h
diff --git a/system/include/libc/sys/inotify.h b/system/lib/libc/musl/include/sys/inotify.h
similarity index 100%
rename from system/include/libc/sys/inotify.h
rename to system/lib/libc/musl/include/sys/inotify.h
diff --git a/system/include/libc/sys/io.h b/system/lib/libc/musl/include/sys/io.h
similarity index 100%
rename from system/include/libc/sys/io.h
rename to system/lib/libc/musl/include/sys/io.h
diff --git a/system/include/libc/sys/ioctl.h b/system/lib/libc/musl/include/sys/ioctl.h
similarity index 100%
rename from system/include/libc/sys/ioctl.h
rename to system/lib/libc/musl/include/sys/ioctl.h
diff --git a/system/include/libc/sys/ipc.h b/system/lib/libc/musl/include/sys/ipc.h
similarity index 100%
rename from system/include/libc/sys/ipc.h
rename to system/lib/libc/musl/include/sys/ipc.h
diff --git a/system/include/libc/sys/kd.h b/system/lib/libc/musl/include/sys/kd.h
similarity index 100%
rename from system/include/libc/sys/kd.h
rename to system/lib/libc/musl/include/sys/kd.h
diff --git a/system/include/libc/sys/klog.h b/system/lib/libc/musl/include/sys/klog.h
similarity index 100%
rename from system/include/libc/sys/klog.h
rename to system/lib/libc/musl/include/sys/klog.h
diff --git a/system/include/libc/sys/mman.h b/system/lib/libc/musl/include/sys/mman.h
similarity index 100%
rename from system/include/libc/sys/mman.h
rename to system/lib/libc/musl/include/sys/mman.h
diff --git a/system/include/libc/sys/mount.h b/system/lib/libc/musl/include/sys/mount.h
similarity index 100%
rename from system/include/libc/sys/mount.h
rename to system/lib/libc/musl/include/sys/mount.h
diff --git a/system/include/libc/sys/msg.h b/system/lib/libc/musl/include/sys/msg.h
similarity index 100%
rename from system/include/libc/sys/msg.h
rename to system/lib/libc/musl/include/sys/msg.h
diff --git a/system/include/libc/sys/mtio.h b/system/lib/libc/musl/include/sys/mtio.h
similarity index 100%
rename from system/include/libc/sys/mtio.h
rename to system/lib/libc/musl/include/sys/mtio.h
diff --git a/system/include/libc/sys/param.h b/system/lib/libc/musl/include/sys/param.h
similarity index 100%
rename from system/include/libc/sys/param.h
rename to system/lib/libc/musl/include/sys/param.h
diff --git a/system/include/libc/sys/personality.h b/system/lib/libc/musl/include/sys/personality.h
similarity index 100%
rename from system/include/libc/sys/personality.h
rename to system/lib/libc/musl/include/sys/personality.h
diff --git a/system/include/libc/sys/poll.h b/system/lib/libc/musl/include/sys/poll.h
similarity index 100%
rename from system/include/libc/sys/poll.h
rename to system/lib/libc/musl/include/sys/poll.h
diff --git a/system/include/libc/sys/prctl.h b/system/lib/libc/musl/include/sys/prctl.h
similarity index 100%
rename from system/include/libc/sys/prctl.h
rename to system/lib/libc/musl/include/sys/prctl.h
diff --git a/system/include/libc/sys/procfs.h b/system/lib/libc/musl/include/sys/procfs.h
similarity index 100%
rename from system/include/libc/sys/procfs.h
rename to system/lib/libc/musl/include/sys/procfs.h
diff --git a/system/include/libc/sys/ptrace.h b/system/lib/libc/musl/include/sys/ptrace.h
similarity index 100%
rename from system/include/libc/sys/ptrace.h
rename to system/lib/libc/musl/include/sys/ptrace.h
diff --git a/system/include/libc/sys/quota.h b/system/lib/libc/musl/include/sys/quota.h
similarity index 100%
rename from system/include/libc/sys/quota.h
rename to system/lib/libc/musl/include/sys/quota.h
diff --git a/system/include/libc/sys/reboot.h b/system/lib/libc/musl/include/sys/reboot.h
similarity index 100%
rename from system/include/libc/sys/reboot.h
rename to system/lib/libc/musl/include/sys/reboot.h
diff --git a/system/include/libc/sys/reg.h b/system/lib/libc/musl/include/sys/reg.h
similarity index 100%
rename from system/include/libc/sys/reg.h
rename to system/lib/libc/musl/include/sys/reg.h
diff --git a/system/include/libc/sys/resource.h b/system/lib/libc/musl/include/sys/resource.h
similarity index 100%
rename from system/include/libc/sys/resource.h
rename to system/lib/libc/musl/include/sys/resource.h
diff --git a/system/include/libc/sys/select.h b/system/lib/libc/musl/include/sys/select.h
similarity index 100%
rename from system/include/libc/sys/select.h
rename to system/lib/libc/musl/include/sys/select.h
diff --git a/system/include/libc/sys/sem.h b/system/lib/libc/musl/include/sys/sem.h
similarity index 100%
rename from system/include/libc/sys/sem.h
rename to system/lib/libc/musl/include/sys/sem.h
diff --git a/system/include/libc/sys/sendfile.h b/system/lib/libc/musl/include/sys/sendfile.h
similarity index 100%
rename from system/include/libc/sys/sendfile.h
rename to system/lib/libc/musl/include/sys/sendfile.h
diff --git a/system/include/libc/sys/shm.h b/system/lib/libc/musl/include/sys/shm.h
similarity index 100%
rename from system/include/libc/sys/shm.h
rename to system/lib/libc/musl/include/sys/shm.h
diff --git a/system/include/libc/sys/signal.h b/system/lib/libc/musl/include/sys/signal.h
similarity index 100%
rename from system/include/libc/sys/signal.h
rename to system/lib/libc/musl/include/sys/signal.h
diff --git a/system/include/libc/sys/signalfd.h b/system/lib/libc/musl/include/sys/signalfd.h
similarity index 100%
rename from system/include/libc/sys/signalfd.h
rename to system/lib/libc/musl/include/sys/signalfd.h
diff --git a/system/include/libc/sys/socket.h b/system/lib/libc/musl/include/sys/socket.h
similarity index 100%
rename from system/include/libc/sys/socket.h
rename to system/lib/libc/musl/include/sys/socket.h
diff --git a/system/include/libc/sys/soundcard.h b/system/lib/libc/musl/include/sys/soundcard.h
similarity index 100%
rename from system/include/libc/sys/soundcard.h
rename to system/lib/libc/musl/include/sys/soundcard.h
diff --git a/system/include/libc/sys/stat.h b/system/lib/libc/musl/include/sys/stat.h
similarity index 100%
rename from system/include/libc/sys/stat.h
rename to system/lib/libc/musl/include/sys/stat.h
diff --git a/system/include/libc/sys/statfs.h b/system/lib/libc/musl/include/sys/statfs.h
similarity index 100%
rename from system/include/libc/sys/statfs.h
rename to system/lib/libc/musl/include/sys/statfs.h
diff --git a/system/include/libc/sys/statvfs.h b/system/lib/libc/musl/include/sys/statvfs.h
similarity index 100%
rename from system/include/libc/sys/statvfs.h
rename to system/lib/libc/musl/include/sys/statvfs.h
diff --git a/system/include/libc/sys/stropts.h b/system/lib/libc/musl/include/sys/stropts.h
similarity index 100%
rename from system/include/libc/sys/stropts.h
rename to system/lib/libc/musl/include/sys/stropts.h
diff --git a/system/include/libc/sys/swap.h b/system/lib/libc/musl/include/sys/swap.h
similarity index 100%
rename from system/include/libc/sys/swap.h
rename to system/lib/libc/musl/include/sys/swap.h
diff --git a/system/include/libc/sys/syscall.h b/system/lib/libc/musl/include/sys/syscall.h
similarity index 100%
rename from system/include/libc/sys/syscall.h
rename to system/lib/libc/musl/include/sys/syscall.h
diff --git a/system/include/libc/sys/sysinfo.h b/system/lib/libc/musl/include/sys/sysinfo.h
similarity index 100%
rename from system/include/libc/sys/sysinfo.h
rename to system/lib/libc/musl/include/sys/sysinfo.h
diff --git a/system/include/libc/sys/syslog.h b/system/lib/libc/musl/include/sys/syslog.h
similarity index 100%
rename from system/include/libc/sys/syslog.h
rename to system/lib/libc/musl/include/sys/syslog.h
diff --git a/system/include/libc/sys/sysmacros.h b/system/lib/libc/musl/include/sys/sysmacros.h
similarity index 100%
rename from system/include/libc/sys/sysmacros.h
rename to system/lib/libc/musl/include/sys/sysmacros.h
diff --git a/system/include/libc/sys/termios.h b/system/lib/libc/musl/include/sys/termios.h
similarity index 100%
rename from system/include/libc/sys/termios.h
rename to system/lib/libc/musl/include/sys/termios.h
diff --git a/system/include/libc/sys/time.h b/system/lib/libc/musl/include/sys/time.h
similarity index 100%
rename from system/include/libc/sys/time.h
rename to system/lib/libc/musl/include/sys/time.h
diff --git a/system/include/libc/sys/timeb.h b/system/lib/libc/musl/include/sys/timeb.h
similarity index 100%
rename from system/include/libc/sys/timeb.h
rename to system/lib/libc/musl/include/sys/timeb.h
diff --git a/system/include/libc/sys/timerfd.h b/system/lib/libc/musl/include/sys/timerfd.h
similarity index 100%
rename from system/include/libc/sys/timerfd.h
rename to system/lib/libc/musl/include/sys/timerfd.h
diff --git a/system/include/libc/sys/times.h b/system/lib/libc/musl/include/sys/times.h
similarity index 100%
rename from system/include/libc/sys/times.h
rename to system/lib/libc/musl/include/sys/times.h
diff --git a/system/include/libc/sys/timex.h b/system/lib/libc/musl/include/sys/timex.h
similarity index 100%
rename from system/include/libc/sys/timex.h
rename to system/lib/libc/musl/include/sys/timex.h
diff --git a/system/include/libc/sys/ttydefaults.h b/system/lib/libc/musl/include/sys/ttydefaults.h
similarity index 100%
rename from system/include/libc/sys/ttydefaults.h
rename to system/lib/libc/musl/include/sys/ttydefaults.h
diff --git a/system/include/libc/sys/types.h b/system/lib/libc/musl/include/sys/types.h
similarity index 100%
rename from system/include/libc/sys/types.h
rename to system/lib/libc/musl/include/sys/types.h
diff --git a/system/include/libc/sys/ucontext.h b/system/lib/libc/musl/include/sys/ucontext.h
similarity index 100%
rename from system/include/libc/sys/ucontext.h
rename to system/lib/libc/musl/include/sys/ucontext.h
diff --git a/system/include/libc/sys/uio.h b/system/lib/libc/musl/include/sys/uio.h
similarity index 100%
rename from system/include/libc/sys/uio.h
rename to system/lib/libc/musl/include/sys/uio.h
diff --git a/system/include/libc/sys/un.h b/system/lib/libc/musl/include/sys/un.h
similarity index 100%
rename from system/include/libc/sys/un.h
rename to system/lib/libc/musl/include/sys/un.h
diff --git a/system/include/libc/sys/user.h b/system/lib/libc/musl/include/sys/user.h
similarity index 100%
rename from system/include/libc/sys/user.h
rename to system/lib/libc/musl/include/sys/user.h
diff --git a/system/include/libc/sys/utsname.h b/system/lib/libc/musl/include/sys/utsname.h
similarity index 100%
rename from system/include/libc/sys/utsname.h
rename to system/lib/libc/musl/include/sys/utsname.h
diff --git a/system/include/libc/sys/vfs.h b/system/lib/libc/musl/include/sys/vfs.h
similarity index 100%
rename from system/include/libc/sys/vfs.h
rename to system/lib/libc/musl/include/sys/vfs.h
diff --git a/system/include/libc/sys/vt.h b/system/lib/libc/musl/include/sys/vt.h
similarity index 100%
rename from system/include/libc/sys/vt.h
rename to system/lib/libc/musl/include/sys/vt.h
diff --git a/system/include/libc/sys/wait.h b/system/lib/libc/musl/include/sys/wait.h
similarity index 100%
rename from system/include/libc/sys/wait.h
rename to system/lib/libc/musl/include/sys/wait.h
diff --git a/system/include/libc/sys/xattr.h b/system/lib/libc/musl/include/sys/xattr.h
similarity index 100%
rename from system/include/libc/sys/xattr.h
rename to system/lib/libc/musl/include/sys/xattr.h
diff --git a/system/include/libc/syscall.h b/system/lib/libc/musl/include/syscall.h
similarity index 100%
rename from system/include/libc/syscall.h
rename to system/lib/libc/musl/include/syscall.h
diff --git a/system/include/libc/sysexits.h b/system/lib/libc/musl/include/sysexits.h
similarity index 100%
rename from system/include/libc/sysexits.h
rename to system/lib/libc/musl/include/sysexits.h
diff --git a/system/include/libc/syslog.h b/system/lib/libc/musl/include/syslog.h
similarity index 100%
rename from system/include/libc/syslog.h
rename to system/lib/libc/musl/include/syslog.h
diff --git a/system/include/libc/tar.h b/system/lib/libc/musl/include/tar.h
similarity index 100%
rename from system/include/libc/tar.h
rename to system/lib/libc/musl/include/tar.h
diff --git a/system/include/libc/termios.h b/system/lib/libc/musl/include/termios.h
similarity index 100%
rename from system/include/libc/termios.h
rename to system/lib/libc/musl/include/termios.h
diff --git a/system/include/libc/tgmath.h b/system/lib/libc/musl/include/tgmath.h
similarity index 100%
rename from system/include/libc/tgmath.h
rename to system/lib/libc/musl/include/tgmath.h
diff --git a/system/include/libc/threads.h b/system/lib/libc/musl/include/threads.h
similarity index 100%
rename from system/include/libc/threads.h
rename to system/lib/libc/musl/include/threads.h
diff --git a/system/include/libc/time.h b/system/lib/libc/musl/include/time.h
similarity index 100%
rename from system/include/libc/time.h
rename to system/lib/libc/musl/include/time.h
diff --git a/system/include/libc/uchar.h b/system/lib/libc/musl/include/uchar.h
similarity index 100%
rename from system/include/libc/uchar.h
rename to system/lib/libc/musl/include/uchar.h
diff --git a/system/include/libc/ucontext.h b/system/lib/libc/musl/include/ucontext.h
similarity index 100%
rename from system/include/libc/ucontext.h
rename to system/lib/libc/musl/include/ucontext.h
diff --git a/system/include/libc/ulimit.h b/system/lib/libc/musl/include/ulimit.h
similarity index 100%
rename from system/include/libc/ulimit.h
rename to system/lib/libc/musl/include/ulimit.h
diff --git a/system/include/libc/unistd.h b/system/lib/libc/musl/include/unistd.h
similarity index 100%
rename from system/include/libc/unistd.h
rename to system/lib/libc/musl/include/unistd.h
diff --git a/system/include/libc/utime.h b/system/lib/libc/musl/include/utime.h
similarity index 100%
rename from system/include/libc/utime.h
rename to system/lib/libc/musl/include/utime.h
diff --git a/system/include/libc/utmp.h b/system/lib/libc/musl/include/utmp.h
similarity index 100%
rename from system/include/libc/utmp.h
rename to system/lib/libc/musl/include/utmp.h
diff --git a/system/include/libc/utmpx.h b/system/lib/libc/musl/include/utmpx.h
similarity index 100%
rename from system/include/libc/utmpx.h
rename to system/lib/libc/musl/include/utmpx.h
diff --git a/system/include/libc/values.h b/system/lib/libc/musl/include/values.h
similarity index 100%
rename from system/include/libc/values.h
rename to system/lib/libc/musl/include/values.h
diff --git a/system/include/libc/wait.h b/system/lib/libc/musl/include/wait.h
similarity index 100%
rename from system/include/libc/wait.h
rename to system/lib/libc/musl/include/wait.h
diff --git a/system/include/libc/wchar.h b/system/lib/libc/musl/include/wchar.h
similarity index 100%
rename from system/include/libc/wchar.h
rename to system/lib/libc/musl/include/wchar.h
diff --git a/system/include/libc/wctype.h b/system/lib/libc/musl/include/wctype.h
similarity index 100%
rename from system/include/libc/wctype.h
rename to system/lib/libc/musl/include/wctype.h
diff --git a/system/include/libc/wordexp.h b/system/lib/libc/musl/include/wordexp.h
similarity index 100%
rename from system/include/libc/wordexp.h
rename to system/lib/libc/musl/include/wordexp.h
diff --git a/system/include/libcxx/__bit_reference b/system/lib/libcxx/include/__bit_reference
similarity index 100%
rename from system/include/libcxx/__bit_reference
rename to system/lib/libcxx/include/__bit_reference
diff --git a/system/include/libcxx/__bsd_locale_defaults.h b/system/lib/libcxx/include/__bsd_locale_defaults.h
similarity index 100%
rename from system/include/libcxx/__bsd_locale_defaults.h
rename to system/lib/libcxx/include/__bsd_locale_defaults.h
diff --git a/system/include/libcxx/__bsd_locale_fallbacks.h b/system/lib/libcxx/include/__bsd_locale_fallbacks.h
similarity index 100%
rename from system/include/libcxx/__bsd_locale_fallbacks.h
rename to system/lib/libcxx/include/__bsd_locale_fallbacks.h
diff --git a/system/include/libcxx/__config b/system/lib/libcxx/include/__config
similarity index 100%
rename from system/include/libcxx/__config
rename to system/lib/libcxx/include/__config
diff --git a/system/include/libcxx/__config_site.in b/system/lib/libcxx/include/__config_site.in
similarity index 100%
rename from system/include/libcxx/__config_site.in
rename to system/lib/libcxx/include/__config_site.in
diff --git a/system/include/libcxx/__debug b/system/lib/libcxx/include/__debug
similarity index 100%
rename from system/include/libcxx/__debug
rename to system/lib/libcxx/include/__debug
diff --git a/system/include/libcxx/__errc b/system/lib/libcxx/include/__errc
similarity index 100%
rename from system/include/libcxx/__errc
rename to system/lib/libcxx/include/__errc
diff --git a/system/include/libcxx/__functional_03 b/system/lib/libcxx/include/__functional_03
similarity index 100%
rename from system/include/libcxx/__functional_03
rename to system/lib/libcxx/include/__functional_03
diff --git a/system/include/libcxx/__functional_base b/system/lib/libcxx/include/__functional_base
similarity index 100%
rename from system/include/libcxx/__functional_base
rename to system/lib/libcxx/include/__functional_base
diff --git a/system/include/libcxx/__functional_base_03 b/system/lib/libcxx/include/__functional_base_03
similarity index 100%
rename from system/include/libcxx/__functional_base_03
rename to system/lib/libcxx/include/__functional_base_03
diff --git a/system/include/libcxx/__hash_table b/system/lib/libcxx/include/__hash_table
similarity index 100%
rename from system/include/libcxx/__hash_table
rename to system/lib/libcxx/include/__hash_table
diff --git a/system/include/libcxx/__libcpp_version b/system/lib/libcxx/include/__libcpp_version
similarity index 100%
rename from system/include/libcxx/__libcpp_version
rename to system/lib/libcxx/include/__libcpp_version
diff --git a/system/include/libcxx/__locale b/system/lib/libcxx/include/__locale
similarity index 100%
rename from system/include/libcxx/__locale
rename to system/lib/libcxx/include/__locale
diff --git a/system/include/libcxx/__mutex_base b/system/lib/libcxx/include/__mutex_base
similarity index 100%
rename from system/include/libcxx/__mutex_base
rename to system/lib/libcxx/include/__mutex_base
diff --git a/system/include/libcxx/__node_handle b/system/lib/libcxx/include/__node_handle
similarity index 100%
rename from system/include/libcxx/__node_handle
rename to system/lib/libcxx/include/__node_handle
diff --git a/system/include/libcxx/__nullptr b/system/lib/libcxx/include/__nullptr
similarity index 100%
rename from system/include/libcxx/__nullptr
rename to system/lib/libcxx/include/__nullptr
diff --git a/system/include/libcxx/__split_buffer b/system/lib/libcxx/include/__split_buffer
similarity index 100%
rename from system/include/libcxx/__split_buffer
rename to system/lib/libcxx/include/__split_buffer
diff --git a/system/include/libcxx/__sso_allocator b/system/lib/libcxx/include/__sso_allocator
similarity index 100%
rename from system/include/libcxx/__sso_allocator
rename to system/lib/libcxx/include/__sso_allocator
diff --git a/system/include/libcxx/__std_stream b/system/lib/libcxx/include/__std_stream
similarity index 100%
rename from system/include/libcxx/__std_stream
rename to system/lib/libcxx/include/__std_stream
diff --git a/system/include/libcxx/__string b/system/lib/libcxx/include/__string
similarity index 100%
rename from system/include/libcxx/__string
rename to system/lib/libcxx/include/__string
diff --git a/system/include/libcxx/__threading_support b/system/lib/libcxx/include/__threading_support
similarity index 100%
rename from system/include/libcxx/__threading_support
rename to system/lib/libcxx/include/__threading_support
diff --git a/system/include/libcxx/__tree b/system/lib/libcxx/include/__tree
similarity index 100%
rename from system/include/libcxx/__tree
rename to system/lib/libcxx/include/__tree
diff --git a/system/include/libcxx/__tuple b/system/lib/libcxx/include/__tuple
similarity index 100%
rename from system/include/libcxx/__tuple
rename to system/lib/libcxx/include/__tuple
diff --git a/system/include/libcxx/__undef_macros b/system/lib/libcxx/include/__undef_macros
similarity index 100%
rename from system/include/libcxx/__undef_macros
rename to system/lib/libcxx/include/__undef_macros
diff --git a/system/include/libcxx/algorithm b/system/lib/libcxx/include/algorithm
similarity index 100%
rename from system/include/libcxx/algorithm
rename to system/lib/libcxx/include/algorithm
diff --git a/system/include/libcxx/any b/system/lib/libcxx/include/any
similarity index 100%
rename from system/include/libcxx/any
rename to system/lib/libcxx/include/any
diff --git a/system/include/libcxx/array b/system/lib/libcxx/include/array
similarity index 100%
rename from system/include/libcxx/array
rename to system/lib/libcxx/include/array
diff --git a/system/include/libcxx/atomic b/system/lib/libcxx/include/atomic
similarity index 100%
rename from system/include/libcxx/atomic
rename to system/lib/libcxx/include/atomic
diff --git a/system/include/libcxx/bit b/system/lib/libcxx/include/bit
similarity index 100%
rename from system/include/libcxx/bit
rename to system/lib/libcxx/include/bit
diff --git a/system/include/libcxx/bitset b/system/lib/libcxx/include/bitset
similarity index 100%
rename from system/include/libcxx/bitset
rename to system/lib/libcxx/include/bitset
diff --git a/system/include/libcxx/cassert b/system/lib/libcxx/include/cassert
similarity index 100%
rename from system/include/libcxx/cassert
rename to system/lib/libcxx/include/cassert
diff --git a/system/include/libcxx/ccomplex b/system/lib/libcxx/include/ccomplex
similarity index 100%
rename from system/include/libcxx/ccomplex
rename to system/lib/libcxx/include/ccomplex
diff --git a/system/include/libcxx/cctype b/system/lib/libcxx/include/cctype
similarity index 100%
rename from system/include/libcxx/cctype
rename to system/lib/libcxx/include/cctype
diff --git a/system/include/libcxx/cerrno b/system/lib/libcxx/include/cerrno
similarity index 100%
rename from system/include/libcxx/cerrno
rename to system/lib/libcxx/include/cerrno
diff --git a/system/include/libcxx/cfenv b/system/lib/libcxx/include/cfenv
similarity index 100%
rename from system/include/libcxx/cfenv
rename to system/lib/libcxx/include/cfenv
diff --git a/system/include/libcxx/cfloat b/system/lib/libcxx/include/cfloat
similarity index 100%
rename from system/include/libcxx/cfloat
rename to system/lib/libcxx/include/cfloat
diff --git a/system/include/libcxx/charconv b/system/lib/libcxx/include/charconv
similarity index 100%
rename from system/include/libcxx/charconv
rename to system/lib/libcxx/include/charconv
diff --git a/system/include/libcxx/chrono b/system/lib/libcxx/include/chrono
similarity index 100%
rename from system/include/libcxx/chrono
rename to system/lib/libcxx/include/chrono
diff --git a/system/include/libcxx/cinttypes b/system/lib/libcxx/include/cinttypes
similarity index 100%
rename from system/include/libcxx/cinttypes
rename to system/lib/libcxx/include/cinttypes
diff --git a/system/include/libcxx/ciso646 b/system/lib/libcxx/include/ciso646
similarity index 100%
rename from system/include/libcxx/ciso646
rename to system/lib/libcxx/include/ciso646
diff --git a/system/include/libcxx/climits b/system/lib/libcxx/include/climits
similarity index 100%
rename from system/include/libcxx/climits
rename to system/lib/libcxx/include/climits
diff --git a/system/include/libcxx/clocale b/system/lib/libcxx/include/clocale
similarity index 100%
rename from system/include/libcxx/clocale
rename to system/lib/libcxx/include/clocale
diff --git a/system/include/libcxx/cmath b/system/lib/libcxx/include/cmath
similarity index 100%
rename from system/include/libcxx/cmath
rename to system/lib/libcxx/include/cmath
diff --git a/system/include/libcxx/codecvt b/system/lib/libcxx/include/codecvt
similarity index 100%
rename from system/include/libcxx/codecvt
rename to system/lib/libcxx/include/codecvt
diff --git a/system/include/libcxx/compare b/system/lib/libcxx/include/compare
similarity index 100%
rename from system/include/libcxx/compare
rename to system/lib/libcxx/include/compare
diff --git a/system/include/libcxx/complex b/system/lib/libcxx/include/complex
similarity index 100%
rename from system/include/libcxx/complex
rename to system/lib/libcxx/include/complex
diff --git a/system/include/libcxx/complex.h b/system/lib/libcxx/include/complex.h
similarity index 100%
rename from system/include/libcxx/complex.h
rename to system/lib/libcxx/include/complex.h
diff --git a/system/include/libcxx/condition_variable b/system/lib/libcxx/include/condition_variable
similarity index 100%
rename from system/include/libcxx/condition_variable
rename to system/lib/libcxx/include/condition_variable
diff --git a/system/include/libcxx/csetjmp b/system/lib/libcxx/include/csetjmp
similarity index 100%
rename from system/include/libcxx/csetjmp
rename to system/lib/libcxx/include/csetjmp
diff --git a/system/include/libcxx/csignal b/system/lib/libcxx/include/csignal
similarity index 100%
rename from system/include/libcxx/csignal
rename to system/lib/libcxx/include/csignal
diff --git a/system/include/libcxx/cstdarg b/system/lib/libcxx/include/cstdarg
similarity index 100%
rename from system/include/libcxx/cstdarg
rename to system/lib/libcxx/include/cstdarg
diff --git a/system/include/libcxx/cstdbool b/system/lib/libcxx/include/cstdbool
similarity index 100%
rename from system/include/libcxx/cstdbool
rename to system/lib/libcxx/include/cstdbool
diff --git a/system/include/libcxx/cstddef b/system/lib/libcxx/include/cstddef
similarity index 100%
rename from system/include/libcxx/cstddef
rename to system/lib/libcxx/include/cstddef
diff --git a/system/include/libcxx/cstdint b/system/lib/libcxx/include/cstdint
similarity index 100%
rename from system/include/libcxx/cstdint
rename to system/lib/libcxx/include/cstdint
diff --git a/system/include/libcxx/cstdio b/system/lib/libcxx/include/cstdio
similarity index 100%
rename from system/include/libcxx/cstdio
rename to system/lib/libcxx/include/cstdio
diff --git a/system/include/libcxx/cstdlib b/system/lib/libcxx/include/cstdlib
similarity index 100%
rename from system/include/libcxx/cstdlib
rename to system/lib/libcxx/include/cstdlib
diff --git a/system/include/libcxx/cstring b/system/lib/libcxx/include/cstring
similarity index 100%
rename from system/include/libcxx/cstring
rename to system/lib/libcxx/include/cstring
diff --git a/system/include/libcxx/ctgmath b/system/lib/libcxx/include/ctgmath
similarity index 100%
rename from system/include/libcxx/ctgmath
rename to system/lib/libcxx/include/ctgmath
diff --git a/system/include/libcxx/ctime b/system/lib/libcxx/include/ctime
similarity index 100%
rename from system/include/libcxx/ctime
rename to system/lib/libcxx/include/ctime
diff --git a/system/include/libcxx/ctype.h b/system/lib/libcxx/include/ctype.h
similarity index 100%
rename from system/include/libcxx/ctype.h
rename to system/lib/libcxx/include/ctype.h
diff --git a/system/include/libcxx/cwchar b/system/lib/libcxx/include/cwchar
similarity index 100%
rename from system/include/libcxx/cwchar
rename to system/lib/libcxx/include/cwchar
diff --git a/system/include/libcxx/cwctype b/system/lib/libcxx/include/cwctype
similarity index 100%
rename from system/include/libcxx/cwctype
rename to system/lib/libcxx/include/cwctype
diff --git a/system/include/libcxx/deque b/system/lib/libcxx/include/deque
similarity index 100%
rename from system/include/libcxx/deque
rename to system/lib/libcxx/include/deque
diff --git a/system/include/libcxx/errno.h b/system/lib/libcxx/include/errno.h
similarity index 100%
rename from system/include/libcxx/errno.h
rename to system/lib/libcxx/include/errno.h
diff --git a/system/include/libcxx/exception b/system/lib/libcxx/include/exception
similarity index 100%
rename from system/include/libcxx/exception
rename to system/lib/libcxx/include/exception
diff --git a/system/include/libcxx/execution b/system/lib/libcxx/include/execution
similarity index 100%
rename from system/include/libcxx/execution
rename to system/lib/libcxx/include/execution
diff --git a/system/include/libcxx/experimental/__config b/system/lib/libcxx/include/experimental/__config
similarity index 100%
rename from system/include/libcxx/experimental/__config
rename to system/lib/libcxx/include/experimental/__config
diff --git a/system/include/libcxx/experimental/__memory b/system/lib/libcxx/include/experimental/__memory
similarity index 100%
rename from system/include/libcxx/experimental/__memory
rename to system/lib/libcxx/include/experimental/__memory
diff --git a/system/include/libcxx/experimental/algorithm b/system/lib/libcxx/include/experimental/algorithm
similarity index 100%
rename from system/include/libcxx/experimental/algorithm
rename to system/lib/libcxx/include/experimental/algorithm
diff --git a/system/include/libcxx/experimental/coroutine b/system/lib/libcxx/include/experimental/coroutine
similarity index 100%
rename from system/include/libcxx/experimental/coroutine
rename to system/lib/libcxx/include/experimental/coroutine
diff --git a/system/include/libcxx/experimental/deque b/system/lib/libcxx/include/experimental/deque
similarity index 100%
rename from system/include/libcxx/experimental/deque
rename to system/lib/libcxx/include/experimental/deque
diff --git a/system/include/libcxx/experimental/filesystem b/system/lib/libcxx/include/experimental/filesystem
similarity index 100%
rename from system/include/libcxx/experimental/filesystem
rename to system/lib/libcxx/include/experimental/filesystem
diff --git a/system/include/libcxx/experimental/forward_list b/system/lib/libcxx/include/experimental/forward_list
similarity index 100%
rename from system/include/libcxx/experimental/forward_list
rename to system/lib/libcxx/include/experimental/forward_list
diff --git a/system/include/libcxx/experimental/functional b/system/lib/libcxx/include/experimental/functional
similarity index 100%
rename from system/include/libcxx/experimental/functional
rename to system/lib/libcxx/include/experimental/functional
diff --git a/system/include/libcxx/experimental/iterator b/system/lib/libcxx/include/experimental/iterator
similarity index 100%
rename from system/include/libcxx/experimental/iterator
rename to system/lib/libcxx/include/experimental/iterator
diff --git a/system/include/libcxx/experimental/list b/system/lib/libcxx/include/experimental/list
similarity index 100%
rename from system/include/libcxx/experimental/list
rename to system/lib/libcxx/include/experimental/list
diff --git a/system/include/libcxx/experimental/map b/system/lib/libcxx/include/experimental/map
similarity index 100%
rename from system/include/libcxx/experimental/map
rename to system/lib/libcxx/include/experimental/map
diff --git a/system/include/libcxx/experimental/memory_resource b/system/lib/libcxx/include/experimental/memory_resource
similarity index 100%
rename from system/include/libcxx/experimental/memory_resource
rename to system/lib/libcxx/include/experimental/memory_resource
diff --git a/system/include/libcxx/experimental/propagate_const b/system/lib/libcxx/include/experimental/propagate_const
similarity index 100%
rename from system/include/libcxx/experimental/propagate_const
rename to system/lib/libcxx/include/experimental/propagate_const
diff --git a/system/include/libcxx/experimental/regex b/system/lib/libcxx/include/experimental/regex
similarity index 100%
rename from system/include/libcxx/experimental/regex
rename to system/lib/libcxx/include/experimental/regex
diff --git a/system/include/libcxx/experimental/set b/system/lib/libcxx/include/experimental/set
similarity index 100%
rename from system/include/libcxx/experimental/set
rename to system/lib/libcxx/include/experimental/set
diff --git a/system/include/libcxx/experimental/simd b/system/lib/libcxx/include/experimental/simd
similarity index 100%
rename from system/include/libcxx/experimental/simd
rename to system/lib/libcxx/include/experimental/simd
diff --git a/system/include/libcxx/experimental/string b/system/lib/libcxx/include/experimental/string
similarity index 100%
rename from system/include/libcxx/experimental/string
rename to system/lib/libcxx/include/experimental/string
diff --git a/system/include/libcxx/experimental/type_traits b/system/lib/libcxx/include/experimental/type_traits
similarity index 100%
rename from system/include/libcxx/experimental/type_traits
rename to system/lib/libcxx/include/experimental/type_traits
diff --git a/system/include/libcxx/experimental/unordered_map b/system/lib/libcxx/include/experimental/unordered_map
similarity index 100%
rename from system/include/libcxx/experimental/unordered_map
rename to system/lib/libcxx/include/experimental/unordered_map
diff --git a/system/include/libcxx/experimental/unordered_set b/system/lib/libcxx/include/experimental/unordered_set
similarity index 100%
rename from system/include/libcxx/experimental/unordered_set
rename to system/lib/libcxx/include/experimental/unordered_set
diff --git a/system/include/libcxx/experimental/utility b/system/lib/libcxx/include/experimental/utility
similarity index 100%
rename from system/include/libcxx/experimental/utility
rename to system/lib/libcxx/include/experimental/utility
diff --git a/system/include/libcxx/experimental/vector b/system/lib/libcxx/include/experimental/vector
similarity index 100%
rename from system/include/libcxx/experimental/vector
rename to system/lib/libcxx/include/experimental/vector
diff --git a/system/include/libcxx/ext/__hash b/system/lib/libcxx/include/ext/__hash
similarity index 100%
rename from system/include/libcxx/ext/__hash
rename to system/lib/libcxx/include/ext/__hash
diff --git a/system/include/libcxx/ext/hash_map b/system/lib/libcxx/include/ext/hash_map
similarity index 100%
rename from system/include/libcxx/ext/hash_map
rename to system/lib/libcxx/include/ext/hash_map
diff --git a/system/include/libcxx/ext/hash_set b/system/lib/libcxx/include/ext/hash_set
similarity index 100%
rename from system/include/libcxx/ext/hash_set
rename to system/lib/libcxx/include/ext/hash_set
diff --git a/system/include/libcxx/fenv.h b/system/lib/libcxx/include/fenv.h
similarity index 100%
rename from system/include/libcxx/fenv.h
rename to system/lib/libcxx/include/fenv.h
diff --git a/system/include/libcxx/filesystem b/system/lib/libcxx/include/filesystem
similarity index 100%
rename from system/include/libcxx/filesystem
rename to system/lib/libcxx/include/filesystem
diff --git a/system/include/libcxx/float.h b/system/lib/libcxx/include/float.h
similarity index 100%
rename from system/include/libcxx/float.h
rename to system/lib/libcxx/include/float.h
diff --git a/system/include/libcxx/forward_list b/system/lib/libcxx/include/forward_list
similarity index 100%
rename from system/include/libcxx/forward_list
rename to system/lib/libcxx/include/forward_list
diff --git a/system/include/libcxx/fstream b/system/lib/libcxx/include/fstream
similarity index 100%
rename from system/include/libcxx/fstream
rename to system/lib/libcxx/include/fstream
diff --git a/system/include/libcxx/functional b/system/lib/libcxx/include/functional
similarity index 100%
rename from system/include/libcxx/functional
rename to system/lib/libcxx/include/functional
diff --git a/system/include/libcxx/future b/system/lib/libcxx/include/future
similarity index 100%
rename from system/include/libcxx/future
rename to system/lib/libcxx/include/future
diff --git a/system/include/libcxx/initializer_list b/system/lib/libcxx/include/initializer_list
similarity index 100%
rename from system/include/libcxx/initializer_list
rename to system/lib/libcxx/include/initializer_list
diff --git a/system/include/libcxx/inttypes.h b/system/lib/libcxx/include/inttypes.h
similarity index 100%
rename from system/include/libcxx/inttypes.h
rename to system/lib/libcxx/include/inttypes.h
diff --git a/system/include/libcxx/iomanip b/system/lib/libcxx/include/iomanip
similarity index 100%
rename from system/include/libcxx/iomanip
rename to system/lib/libcxx/include/iomanip
diff --git a/system/include/libcxx/ios b/system/lib/libcxx/include/ios
similarity index 100%
rename from system/include/libcxx/ios
rename to system/lib/libcxx/include/ios
diff --git a/system/include/libcxx/iosfwd b/system/lib/libcxx/include/iosfwd
similarity index 100%
rename from system/include/libcxx/iosfwd
rename to system/lib/libcxx/include/iosfwd
diff --git a/system/include/libcxx/iostream b/system/lib/libcxx/include/iostream
similarity index 100%
rename from system/include/libcxx/iostream
rename to system/lib/libcxx/include/iostream
diff --git a/system/include/libcxx/istream b/system/lib/libcxx/include/istream
similarity index 100%
rename from system/include/libcxx/istream
rename to system/lib/libcxx/include/istream
diff --git a/system/include/libcxx/iterator b/system/lib/libcxx/include/iterator
similarity index 100%
rename from system/include/libcxx/iterator
rename to system/lib/libcxx/include/iterator
diff --git a/system/include/libcxx/limits b/system/lib/libcxx/include/limits
similarity index 100%
rename from system/include/libcxx/limits
rename to system/lib/libcxx/include/limits
diff --git a/system/include/libcxx/limits.h b/system/lib/libcxx/include/limits.h
similarity index 100%
rename from system/include/libcxx/limits.h
rename to system/lib/libcxx/include/limits.h
diff --git a/system/include/libcxx/list b/system/lib/libcxx/include/list
similarity index 100%
rename from system/include/libcxx/list
rename to system/lib/libcxx/include/list
diff --git a/system/include/libcxx/locale b/system/lib/libcxx/include/locale
similarity index 100%
rename from system/include/libcxx/locale
rename to system/lib/libcxx/include/locale
diff --git a/system/include/libcxx/locale.h b/system/lib/libcxx/include/locale.h
similarity index 100%
rename from system/include/libcxx/locale.h
rename to system/lib/libcxx/include/locale.h
diff --git a/system/include/libcxx/map b/system/lib/libcxx/include/map
similarity index 100%
rename from system/include/libcxx/map
rename to system/lib/libcxx/include/map
diff --git a/system/include/libcxx/math.h b/system/lib/libcxx/include/math.h
similarity index 100%
rename from system/include/libcxx/math.h
rename to system/lib/libcxx/include/math.h
diff --git a/system/include/libcxx/memory b/system/lib/libcxx/include/memory
similarity index 100%
rename from system/include/libcxx/memory
rename to system/lib/libcxx/include/memory
diff --git a/system/include/libcxx/module.modulemap b/system/lib/libcxx/include/module.modulemap
similarity index 100%
rename from system/include/libcxx/module.modulemap
rename to system/lib/libcxx/include/module.modulemap
diff --git a/system/include/libcxx/mutex b/system/lib/libcxx/include/mutex
similarity index 100%
rename from system/include/libcxx/mutex
rename to system/lib/libcxx/include/mutex
diff --git a/system/include/libcxx/new b/system/lib/libcxx/include/new
similarity index 100%
rename from system/include/libcxx/new
rename to system/lib/libcxx/include/new
diff --git a/system/include/libcxx/numeric b/system/lib/libcxx/include/numeric
similarity index 100%
rename from system/include/libcxx/numeric
rename to system/lib/libcxx/include/numeric
diff --git a/system/include/libcxx/optional b/system/lib/libcxx/include/optional
similarity index 100%
rename from system/include/libcxx/optional
rename to system/lib/libcxx/include/optional
diff --git a/system/include/libcxx/ostream b/system/lib/libcxx/include/ostream
similarity index 100%
rename from system/include/libcxx/ostream
rename to system/lib/libcxx/include/ostream
diff --git a/system/include/libcxx/queue b/system/lib/libcxx/include/queue
similarity index 100%
rename from system/include/libcxx/queue
rename to system/lib/libcxx/include/queue
diff --git a/system/include/libcxx/random b/system/lib/libcxx/include/random
similarity index 100%
rename from system/include/libcxx/random
rename to system/lib/libcxx/include/random
diff --git a/system/include/libcxx/ratio b/system/lib/libcxx/include/ratio
similarity index 100%
rename from system/include/libcxx/ratio
rename to system/lib/libcxx/include/ratio
diff --git a/system/include/libcxx/readme.txt b/system/lib/libcxx/include/readme.txt
similarity index 100%
rename from system/include/libcxx/readme.txt
rename to system/lib/libcxx/include/readme.txt
diff --git a/system/include/libcxx/regex b/system/lib/libcxx/include/regex
similarity index 100%
rename from system/include/libcxx/regex
rename to system/lib/libcxx/include/regex
diff --git a/system/include/libcxx/scoped_allocator b/system/lib/libcxx/include/scoped_allocator
similarity index 100%
rename from system/include/libcxx/scoped_allocator
rename to system/lib/libcxx/include/scoped_allocator
diff --git a/system/include/libcxx/set b/system/lib/libcxx/include/set
similarity index 100%
rename from system/include/libcxx/set
rename to system/lib/libcxx/include/set
diff --git a/system/include/libcxx/setjmp.h b/system/lib/libcxx/include/setjmp.h
similarity index 100%
rename from system/include/libcxx/setjmp.h
rename to system/lib/libcxx/include/setjmp.h
diff --git a/system/include/libcxx/shared_mutex b/system/lib/libcxx/include/shared_mutex
similarity index 100%
rename from system/include/libcxx/shared_mutex
rename to system/lib/libcxx/include/shared_mutex
diff --git a/system/include/libcxx/span b/system/lib/libcxx/include/span
similarity index 100%
rename from system/include/libcxx/span
rename to system/lib/libcxx/include/span
diff --git a/system/include/libcxx/sstream b/system/lib/libcxx/include/sstream
similarity index 100%
rename from system/include/libcxx/sstream
rename to system/lib/libcxx/include/sstream
diff --git a/system/include/libcxx/stack b/system/lib/libcxx/include/stack
similarity index 100%
rename from system/include/libcxx/stack
rename to system/lib/libcxx/include/stack
diff --git a/system/include/libcxx/stdbool.h b/system/lib/libcxx/include/stdbool.h
similarity index 100%
rename from system/include/libcxx/stdbool.h
rename to system/lib/libcxx/include/stdbool.h
diff --git a/system/include/libcxx/stddef.h b/system/lib/libcxx/include/stddef.h
similarity index 100%
rename from system/include/libcxx/stddef.h
rename to system/lib/libcxx/include/stddef.h
diff --git a/system/include/libcxx/stdexcept b/system/lib/libcxx/include/stdexcept
similarity index 100%
rename from system/include/libcxx/stdexcept
rename to system/lib/libcxx/include/stdexcept
diff --git a/system/include/libcxx/stdint.h b/system/lib/libcxx/include/stdint.h
similarity index 100%
rename from system/include/libcxx/stdint.h
rename to system/lib/libcxx/include/stdint.h
diff --git a/system/include/libcxx/stdio.h b/system/lib/libcxx/include/stdio.h
similarity index 100%
rename from system/include/libcxx/stdio.h
rename to system/lib/libcxx/include/stdio.h
diff --git a/system/include/libcxx/stdlib.h b/system/lib/libcxx/include/stdlib.h
similarity index 100%
rename from system/include/libcxx/stdlib.h
rename to system/lib/libcxx/include/stdlib.h
diff --git a/system/include/libcxx/streambuf b/system/lib/libcxx/include/streambuf
similarity index 100%
rename from system/include/libcxx/streambuf
rename to system/lib/libcxx/include/streambuf
diff --git a/system/include/libcxx/string b/system/lib/libcxx/include/string
similarity index 100%
rename from system/include/libcxx/string
rename to system/lib/libcxx/include/string
diff --git a/system/include/libcxx/string.h b/system/lib/libcxx/include/string.h
similarity index 100%
rename from system/include/libcxx/string.h
rename to system/lib/libcxx/include/string.h
diff --git a/system/include/libcxx/string_view b/system/lib/libcxx/include/string_view
similarity index 100%
rename from system/include/libcxx/string_view
rename to system/lib/libcxx/include/string_view
diff --git a/system/include/libcxx/strstream b/system/lib/libcxx/include/strstream
similarity index 100%
rename from system/include/libcxx/strstream
rename to system/lib/libcxx/include/strstream
diff --git a/system/include/libcxx/support/android/locale_bionic.h b/system/lib/libcxx/include/support/android/locale_bionic.h
similarity index 100%
rename from system/include/libcxx/support/android/locale_bionic.h
rename to system/lib/libcxx/include/support/android/locale_bionic.h
diff --git a/system/include/libcxx/support/fuchsia/xlocale.h b/system/lib/libcxx/include/support/fuchsia/xlocale.h
similarity index 100%
rename from system/include/libcxx/support/fuchsia/xlocale.h
rename to system/lib/libcxx/include/support/fuchsia/xlocale.h
diff --git a/system/include/libcxx/support/ibm/limits.h b/system/lib/libcxx/include/support/ibm/limits.h
similarity index 100%
rename from system/include/libcxx/support/ibm/limits.h
rename to system/lib/libcxx/include/support/ibm/limits.h
diff --git a/system/include/libcxx/support/ibm/locale_mgmt_aix.h b/system/lib/libcxx/include/support/ibm/locale_mgmt_aix.h
similarity index 100%
rename from system/include/libcxx/support/ibm/locale_mgmt_aix.h
rename to system/lib/libcxx/include/support/ibm/locale_mgmt_aix.h
diff --git a/system/include/libcxx/support/ibm/support.h b/system/lib/libcxx/include/support/ibm/support.h
similarity index 100%
rename from system/include/libcxx/support/ibm/support.h
rename to system/lib/libcxx/include/support/ibm/support.h
diff --git a/system/include/libcxx/support/ibm/xlocale.h b/system/lib/libcxx/include/support/ibm/xlocale.h
similarity index 100%
rename from system/include/libcxx/support/ibm/xlocale.h
rename to system/lib/libcxx/include/support/ibm/xlocale.h
diff --git a/system/include/libcxx/support/musl/xlocale.h b/system/lib/libcxx/include/support/musl/xlocale.h
similarity index 100%
rename from system/include/libcxx/support/musl/xlocale.h
rename to system/lib/libcxx/include/support/musl/xlocale.h
diff --git a/system/include/libcxx/support/newlib/xlocale.h b/system/lib/libcxx/include/support/newlib/xlocale.h
similarity index 100%
rename from system/include/libcxx/support/newlib/xlocale.h
rename to system/lib/libcxx/include/support/newlib/xlocale.h
diff --git a/system/include/libcxx/support/solaris/floatingpoint.h b/system/lib/libcxx/include/support/solaris/floatingpoint.h
similarity index 100%
rename from system/include/libcxx/support/solaris/floatingpoint.h
rename to system/lib/libcxx/include/support/solaris/floatingpoint.h
diff --git a/system/include/libcxx/support/solaris/wchar.h b/system/lib/libcxx/include/support/solaris/wchar.h
similarity index 100%
rename from system/include/libcxx/support/solaris/wchar.h
rename to system/lib/libcxx/include/support/solaris/wchar.h
diff --git a/system/include/libcxx/support/solaris/xlocale.h b/system/lib/libcxx/include/support/solaris/xlocale.h
similarity index 100%
rename from system/include/libcxx/support/solaris/xlocale.h
rename to system/lib/libcxx/include/support/solaris/xlocale.h
diff --git a/system/include/libcxx/support/win32/limits_msvc_win32.h b/system/lib/libcxx/include/support/win32/limits_msvc_win32.h
similarity index 100%
rename from system/include/libcxx/support/win32/limits_msvc_win32.h
rename to system/lib/libcxx/include/support/win32/limits_msvc_win32.h
diff --git a/system/include/libcxx/support/win32/locale_win32.h b/system/lib/libcxx/include/support/win32/locale_win32.h
similarity index 100%
rename from system/include/libcxx/support/win32/locale_win32.h
rename to system/lib/libcxx/include/support/win32/locale_win32.h
diff --git a/system/include/libcxx/support/xlocale/__nop_locale_mgmt.h b/system/lib/libcxx/include/support/xlocale/__nop_locale_mgmt.h
similarity index 100%
rename from system/include/libcxx/support/xlocale/__nop_locale_mgmt.h
rename to system/lib/libcxx/include/support/xlocale/__nop_locale_mgmt.h
diff --git a/system/include/libcxx/support/xlocale/__posix_l_fallback.h b/system/lib/libcxx/include/support/xlocale/__posix_l_fallback.h
similarity index 100%
rename from system/include/libcxx/support/xlocale/__posix_l_fallback.h
rename to system/lib/libcxx/include/support/xlocale/__posix_l_fallback.h
diff --git a/system/include/libcxx/support/xlocale/__strtonum_fallback.h b/system/lib/libcxx/include/support/xlocale/__strtonum_fallback.h
similarity index 100%
rename from system/include/libcxx/support/xlocale/__strtonum_fallback.h
rename to system/lib/libcxx/include/support/xlocale/__strtonum_fallback.h
diff --git a/system/include/libcxx/system_error b/system/lib/libcxx/include/system_error
similarity index 100%
rename from system/include/libcxx/system_error
rename to system/lib/libcxx/include/system_error
diff --git a/system/include/libcxx/tgmath.h b/system/lib/libcxx/include/tgmath.h
similarity index 100%
rename from system/include/libcxx/tgmath.h
rename to system/lib/libcxx/include/tgmath.h
diff --git a/system/include/libcxx/thread b/system/lib/libcxx/include/thread
similarity index 100%
rename from system/include/libcxx/thread
rename to system/lib/libcxx/include/thread
diff --git a/system/include/libcxx/tuple b/system/lib/libcxx/include/tuple
similarity index 100%
rename from system/include/libcxx/tuple
rename to system/lib/libcxx/include/tuple
diff --git a/system/include/libcxx/type_traits b/system/lib/libcxx/include/type_traits
similarity index 100%
rename from system/include/libcxx/type_traits
rename to system/lib/libcxx/include/type_traits
diff --git a/system/include/libcxx/typeindex b/system/lib/libcxx/include/typeindex
similarity index 100%
rename from system/include/libcxx/typeindex
rename to system/lib/libcxx/include/typeindex
diff --git a/system/include/libcxx/typeinfo b/system/lib/libcxx/include/typeinfo
similarity index 100%
rename from system/include/libcxx/typeinfo
rename to system/lib/libcxx/include/typeinfo
diff --git a/system/include/libcxx/unordered_map b/system/lib/libcxx/include/unordered_map
similarity index 100%
rename from system/include/libcxx/unordered_map
rename to system/lib/libcxx/include/unordered_map
diff --git a/system/include/libcxx/unordered_set b/system/lib/libcxx/include/unordered_set
similarity index 100%
rename from system/include/libcxx/unordered_set
rename to system/lib/libcxx/include/unordered_set
diff --git a/system/include/libcxx/utility b/system/lib/libcxx/include/utility
similarity index 100%
rename from system/include/libcxx/utility
rename to system/lib/libcxx/include/utility
diff --git a/system/include/libcxx/valarray b/system/lib/libcxx/include/valarray
similarity index 100%
rename from system/include/libcxx/valarray
rename to system/lib/libcxx/include/valarray
diff --git a/system/include/libcxx/variant b/system/lib/libcxx/include/variant
similarity index 100%
rename from system/include/libcxx/variant
rename to system/lib/libcxx/include/variant
diff --git a/system/include/libcxx/vector b/system/lib/libcxx/include/vector
similarity index 100%
rename from system/include/libcxx/vector
rename to system/lib/libcxx/include/vector
diff --git a/system/include/libcxx/version b/system/lib/libcxx/include/version
similarity index 100%
rename from system/include/libcxx/version
rename to system/lib/libcxx/include/version
diff --git a/system/include/libcxx/wchar.h b/system/lib/libcxx/include/wchar.h
similarity index 100%
rename from system/include/libcxx/wchar.h
rename to system/lib/libcxx/include/wchar.h
diff --git a/system/include/libcxx/wctype.h b/system/lib/libcxx/include/wctype.h
similarity index 100%
rename from system/include/libcxx/wctype.h
rename to system/lib/libcxx/include/wctype.h
diff --git a/system/lib/libcxx/algorithm.cpp b/system/lib/libcxx/src/algorithm.cpp
similarity index 100%
rename from system/lib/libcxx/algorithm.cpp
rename to system/lib/libcxx/src/algorithm.cpp
diff --git a/system/lib/libcxx/any.cpp b/system/lib/libcxx/src/any.cpp
similarity index 100%
rename from system/lib/libcxx/any.cpp
rename to system/lib/libcxx/src/any.cpp
diff --git a/system/lib/libcxx/bind.cpp b/system/lib/libcxx/src/bind.cpp
similarity index 100%
rename from system/lib/libcxx/bind.cpp
rename to system/lib/libcxx/src/bind.cpp
diff --git a/system/lib/libcxx/charconv.cpp b/system/lib/libcxx/src/charconv.cpp
similarity index 100%
rename from system/lib/libcxx/charconv.cpp
rename to system/lib/libcxx/src/charconv.cpp
diff --git a/system/lib/libcxx/chrono.cpp b/system/lib/libcxx/src/chrono.cpp
similarity index 100%
rename from system/lib/libcxx/chrono.cpp
rename to system/lib/libcxx/src/chrono.cpp
diff --git a/system/lib/libcxx/condition_variable.cpp b/system/lib/libcxx/src/condition_variable.cpp
similarity index 100%
rename from system/lib/libcxx/condition_variable.cpp
rename to system/lib/libcxx/src/condition_variable.cpp
diff --git a/system/lib/libcxx/condition_variable_destructor.cpp b/system/lib/libcxx/src/condition_variable_destructor.cpp
similarity index 100%
rename from system/lib/libcxx/condition_variable_destructor.cpp
rename to system/lib/libcxx/src/condition_variable_destructor.cpp
diff --git a/system/lib/libcxx/debug.cpp b/system/lib/libcxx/src/debug.cpp
similarity index 100%
rename from system/lib/libcxx/debug.cpp
rename to system/lib/libcxx/src/debug.cpp
diff --git a/system/lib/libcxx/exception.cpp b/system/lib/libcxx/src/exception.cpp
similarity index 100%
rename from system/lib/libcxx/exception.cpp
rename to system/lib/libcxx/src/exception.cpp
diff --git a/system/lib/libcxx/experimental/memory_resource.cpp b/system/lib/libcxx/src/experimental/memory_resource.cpp
similarity index 100%
rename from system/lib/libcxx/experimental/memory_resource.cpp
rename to system/lib/libcxx/src/experimental/memory_resource.cpp
diff --git a/system/lib/libcxx/filesystem/directory_iterator.cpp b/system/lib/libcxx/src/filesystem/directory_iterator.cpp
similarity index 100%
rename from system/lib/libcxx/filesystem/directory_iterator.cpp
rename to system/lib/libcxx/src/filesystem/directory_iterator.cpp
diff --git a/system/lib/libcxx/filesystem/filesystem_common.h b/system/lib/libcxx/src/filesystem/filesystem_common.h
similarity index 100%
rename from system/lib/libcxx/filesystem/filesystem_common.h
rename to system/lib/libcxx/src/filesystem/filesystem_common.h
diff --git a/system/lib/libcxx/filesystem/int128_builtins.cpp b/system/lib/libcxx/src/filesystem/int128_builtins.cpp
similarity index 100%
rename from system/lib/libcxx/filesystem/int128_builtins.cpp
rename to system/lib/libcxx/src/filesystem/int128_builtins.cpp
diff --git a/system/lib/libcxx/filesystem/operations.cpp b/system/lib/libcxx/src/filesystem/operations.cpp
similarity index 100%
rename from system/lib/libcxx/filesystem/operations.cpp
rename to system/lib/libcxx/src/filesystem/operations.cpp
diff --git a/system/lib/libcxx/functional.cpp b/system/lib/libcxx/src/functional.cpp
similarity index 100%
rename from system/lib/libcxx/functional.cpp
rename to system/lib/libcxx/src/functional.cpp
diff --git a/system/lib/libcxx/future.cpp b/system/lib/libcxx/src/future.cpp
similarity index 100%
rename from system/lib/libcxx/future.cpp
rename to system/lib/libcxx/src/future.cpp
diff --git a/system/lib/libcxx/hash.cpp b/system/lib/libcxx/src/hash.cpp
similarity index 100%
rename from system/lib/libcxx/hash.cpp
rename to system/lib/libcxx/src/hash.cpp
diff --git a/system/lib/libcxx/include/apple_availability.h b/system/lib/libcxx/src/include/apple_availability.h
similarity index 100%
rename from system/lib/libcxx/include/apple_availability.h
rename to system/lib/libcxx/src/include/apple_availability.h
diff --git a/system/lib/libcxx/include/atomic_support.h b/system/lib/libcxx/src/include/atomic_support.h
similarity index 100%
rename from system/lib/libcxx/include/atomic_support.h
rename to system/lib/libcxx/src/include/atomic_support.h
diff --git a/system/lib/libcxx/include/config_elast.h b/system/lib/libcxx/src/include/config_elast.h
similarity index 100%
rename from system/lib/libcxx/include/config_elast.h
rename to system/lib/libcxx/src/include/config_elast.h
diff --git a/system/lib/libcxx/include/refstring.h b/system/lib/libcxx/src/include/refstring.h
similarity index 100%
rename from system/lib/libcxx/include/refstring.h
rename to system/lib/libcxx/src/include/refstring.h
diff --git a/system/lib/libcxx/ios.cpp b/system/lib/libcxx/src/ios.cpp
similarity index 100%
rename from system/lib/libcxx/ios.cpp
rename to system/lib/libcxx/src/ios.cpp
diff --git a/system/lib/libcxx/iostream.cpp b/system/lib/libcxx/src/iostream.cpp
similarity index 100%
rename from system/lib/libcxx/iostream.cpp
rename to system/lib/libcxx/src/iostream.cpp
diff --git a/system/lib/libcxx/locale.cpp b/system/lib/libcxx/src/locale.cpp
similarity index 100%
rename from system/lib/libcxx/locale.cpp
rename to system/lib/libcxx/src/locale.cpp
diff --git a/system/lib/libcxx/memory.cpp b/system/lib/libcxx/src/memory.cpp
similarity index 100%
rename from system/lib/libcxx/memory.cpp
rename to system/lib/libcxx/src/memory.cpp
diff --git a/system/lib/libcxx/mutex.cpp b/system/lib/libcxx/src/mutex.cpp
similarity index 100%
rename from system/lib/libcxx/mutex.cpp
rename to system/lib/libcxx/src/mutex.cpp
diff --git a/system/lib/libcxx/mutex_destructor.cpp b/system/lib/libcxx/src/mutex_destructor.cpp
similarity index 100%
rename from system/lib/libcxx/mutex_destructor.cpp
rename to system/lib/libcxx/src/mutex_destructor.cpp
diff --git a/system/lib/libcxx/new.cpp b/system/lib/libcxx/src/new.cpp
similarity index 100%
rename from system/lib/libcxx/new.cpp
rename to system/lib/libcxx/src/new.cpp
diff --git a/system/lib/libcxx/optional.cpp b/system/lib/libcxx/src/optional.cpp
similarity index 100%
rename from system/lib/libcxx/optional.cpp
rename to system/lib/libcxx/src/optional.cpp
diff --git a/system/lib/libcxx/random.cpp b/system/lib/libcxx/src/random.cpp
similarity index 100%
rename from system/lib/libcxx/random.cpp
rename to system/lib/libcxx/src/random.cpp
diff --git a/system/lib/libcxx/regex.cpp b/system/lib/libcxx/src/regex.cpp
similarity index 100%
rename from system/lib/libcxx/regex.cpp
rename to system/lib/libcxx/src/regex.cpp
diff --git a/system/lib/libcxx/shared_mutex.cpp b/system/lib/libcxx/src/shared_mutex.cpp
similarity index 100%
rename from system/lib/libcxx/shared_mutex.cpp
rename to system/lib/libcxx/src/shared_mutex.cpp
diff --git a/system/lib/libcxx/stdexcept.cpp b/system/lib/libcxx/src/stdexcept.cpp
similarity index 100%
rename from system/lib/libcxx/stdexcept.cpp
rename to system/lib/libcxx/src/stdexcept.cpp
diff --git a/system/lib/libcxx/string.cpp b/system/lib/libcxx/src/string.cpp
similarity index 100%
rename from system/lib/libcxx/string.cpp
rename to system/lib/libcxx/src/string.cpp
diff --git a/system/lib/libcxx/strstream.cpp b/system/lib/libcxx/src/strstream.cpp
similarity index 100%
rename from system/lib/libcxx/strstream.cpp
rename to system/lib/libcxx/src/strstream.cpp
diff --git a/system/lib/libcxx/support/runtime/exception_fallback.ipp b/system/lib/libcxx/src/support/runtime/exception_fallback.ipp
similarity index 100%
rename from system/lib/libcxx/support/runtime/exception_fallback.ipp
rename to system/lib/libcxx/src/support/runtime/exception_fallback.ipp
diff --git a/system/lib/libcxx/support/runtime/exception_glibcxx.ipp b/system/lib/libcxx/src/support/runtime/exception_glibcxx.ipp
similarity index 100%
rename from system/lib/libcxx/support/runtime/exception_glibcxx.ipp
rename to system/lib/libcxx/src/support/runtime/exception_glibcxx.ipp
diff --git a/system/lib/libcxx/support/runtime/exception_libcxxabi.ipp b/system/lib/libcxx/src/support/runtime/exception_libcxxabi.ipp
similarity index 100%
rename from system/lib/libcxx/support/runtime/exception_libcxxabi.ipp
rename to system/lib/libcxx/src/support/runtime/exception_libcxxabi.ipp
diff --git a/system/lib/libcxx/support/runtime/exception_libcxxrt.ipp b/system/lib/libcxx/src/support/runtime/exception_libcxxrt.ipp
similarity index 100%
rename from system/lib/libcxx/support/runtime/exception_libcxxrt.ipp
rename to system/lib/libcxx/src/support/runtime/exception_libcxxrt.ipp
diff --git a/system/lib/libcxx/support/runtime/exception_msvc.ipp b/system/lib/libcxx/src/support/runtime/exception_msvc.ipp
similarity index 100%
rename from system/lib/libcxx/support/runtime/exception_msvc.ipp
rename to system/lib/libcxx/src/support/runtime/exception_msvc.ipp
diff --git a/system/lib/libcxx/support/runtime/exception_pointer_cxxabi.ipp b/system/lib/libcxx/src/support/runtime/exception_pointer_cxxabi.ipp
similarity index 100%
rename from system/lib/libcxx/support/runtime/exception_pointer_cxxabi.ipp
rename to system/lib/libcxx/src/support/runtime/exception_pointer_cxxabi.ipp
diff --git a/system/lib/libcxx/support/runtime/exception_pointer_glibcxx.ipp b/system/lib/libcxx/src/support/runtime/exception_pointer_glibcxx.ipp
similarity index 100%
rename from system/lib/libcxx/support/runtime/exception_pointer_glibcxx.ipp
rename to system/lib/libcxx/src/support/runtime/exception_pointer_glibcxx.ipp
diff --git a/system/lib/libcxx/support/runtime/exception_pointer_msvc.ipp b/system/lib/libcxx/src/support/runtime/exception_pointer_msvc.ipp
similarity index 100%
rename from system/lib/libcxx/support/runtime/exception_pointer_msvc.ipp
rename to system/lib/libcxx/src/support/runtime/exception_pointer_msvc.ipp
diff --git a/system/lib/libcxx/support/runtime/exception_pointer_unimplemented.ipp b/system/lib/libcxx/src/support/runtime/exception_pointer_unimplemented.ipp
similarity index 100%
rename from system/lib/libcxx/support/runtime/exception_pointer_unimplemented.ipp
rename to system/lib/libcxx/src/support/runtime/exception_pointer_unimplemented.ipp
diff --git a/system/lib/libcxx/support/runtime/new_handler_fallback.ipp b/system/lib/libcxx/src/support/runtime/new_handler_fallback.ipp
similarity index 100%
rename from system/lib/libcxx/support/runtime/new_handler_fallback.ipp
rename to system/lib/libcxx/src/support/runtime/new_handler_fallback.ipp
diff --git a/system/lib/libcxx/support/runtime/stdexcept_default.ipp b/system/lib/libcxx/src/support/runtime/stdexcept_default.ipp
similarity index 100%
rename from system/lib/libcxx/support/runtime/stdexcept_default.ipp
rename to system/lib/libcxx/src/support/runtime/stdexcept_default.ipp
diff --git a/system/lib/libcxx/support/runtime/stdexcept_vcruntime.ipp b/system/lib/libcxx/src/support/runtime/stdexcept_vcruntime.ipp
similarity index 100%
rename from system/lib/libcxx/support/runtime/stdexcept_vcruntime.ipp
rename to system/lib/libcxx/src/support/runtime/stdexcept_vcruntime.ipp
diff --git a/system/lib/libcxx/support/solaris/README b/system/lib/libcxx/src/support/solaris/README
similarity index 100%
rename from system/lib/libcxx/support/solaris/README
rename to system/lib/libcxx/src/support/solaris/README
diff --git a/system/lib/libcxx/support/solaris/mbsnrtowcs.inc b/system/lib/libcxx/src/support/solaris/mbsnrtowcs.inc
similarity index 100%
rename from system/lib/libcxx/support/solaris/mbsnrtowcs.inc
rename to system/lib/libcxx/src/support/solaris/mbsnrtowcs.inc
diff --git a/system/lib/libcxx/support/solaris/wcsnrtombs.inc b/system/lib/libcxx/src/support/solaris/wcsnrtombs.inc
similarity index 100%
rename from system/lib/libcxx/support/solaris/wcsnrtombs.inc
rename to system/lib/libcxx/src/support/solaris/wcsnrtombs.inc
diff --git a/system/lib/libcxx/support/solaris/xlocale.cpp b/system/lib/libcxx/src/support/solaris/xlocale.cpp
similarity index 100%
rename from system/lib/libcxx/support/solaris/xlocale.cpp
rename to system/lib/libcxx/src/support/solaris/xlocale.cpp
diff --git a/system/lib/libcxx/support/win32/locale_win32.cpp b/system/lib/libcxx/src/support/win32/locale_win32.cpp
similarity index 100%
rename from system/lib/libcxx/support/win32/locale_win32.cpp
rename to system/lib/libcxx/src/support/win32/locale_win32.cpp
diff --git a/system/lib/libcxx/support/win32/support.cpp b/system/lib/libcxx/src/support/win32/support.cpp
similarity index 100%
rename from system/lib/libcxx/support/win32/support.cpp
rename to system/lib/libcxx/src/support/win32/support.cpp
diff --git a/system/lib/libcxx/support/win32/thread_win32.cpp b/system/lib/libcxx/src/support/win32/thread_win32.cpp
similarity index 100%
rename from system/lib/libcxx/support/win32/thread_win32.cpp
rename to system/lib/libcxx/src/support/win32/thread_win32.cpp
diff --git a/system/lib/libcxx/system_error.cpp b/system/lib/libcxx/src/system_error.cpp
similarity index 100%
rename from system/lib/libcxx/system_error.cpp
rename to system/lib/libcxx/src/system_error.cpp
diff --git a/system/lib/libcxx/thread.cpp b/system/lib/libcxx/src/thread.cpp
similarity index 100%
rename from system/lib/libcxx/thread.cpp
rename to system/lib/libcxx/src/thread.cpp
diff --git a/system/lib/libcxx/typeinfo.cpp b/system/lib/libcxx/src/typeinfo.cpp
similarity index 100%
rename from system/lib/libcxx/typeinfo.cpp
rename to system/lib/libcxx/src/typeinfo.cpp
diff --git a/system/lib/libcxx/utility.cpp b/system/lib/libcxx/src/utility.cpp
similarity index 100%
rename from system/lib/libcxx/utility.cpp
rename to system/lib/libcxx/src/utility.cpp
diff --git a/system/lib/libcxx/valarray.cpp b/system/lib/libcxx/src/valarray.cpp
similarity index 100%
rename from system/lib/libcxx/valarray.cpp
rename to system/lib/libcxx/src/valarray.cpp
diff --git a/system/lib/libcxx/variant.cpp b/system/lib/libcxx/src/variant.cpp
similarity index 100%
rename from system/lib/libcxx/variant.cpp
rename to system/lib/libcxx/src/variant.cpp
diff --git a/system/lib/libcxx/vector.cpp b/system/lib/libcxx/src/vector.cpp
similarity index 100%
rename from system/lib/libcxx/vector.cpp
rename to system/lib/libcxx/src/vector.cpp
diff --git a/tools/system_libs.py b/tools/system_libs.py
old mode 100755
new mode 100644
index 2d5a82de8eb6b..9802748681a94
--- a/tools/system_libs.py
+++ b/tools/system_libs.py
@@ -947,7 +947,7 @@ class libcxx(NoExceptLibrary, MTLibrary):
   cflags = ['-DLIBCXX_BUILDING_LIBCXXABI=1', '-D_LIBCPP_BUILDING_LIBRARY', '-Oz',
             '-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS']
 
-  src_dir = ['system', 'lib', 'libcxx']
+  src_dir = ['system', 'lib', 'libcxx', 'src']
   src_glob = '**/*.cpp'
   src_glob_exclude = ['locale_win32.cpp', 'thread_win32.cpp', 'support.cpp', 'int128_builtins.cpp']
 
@@ -1923,13 +1923,12 @@ def copytree_exist_ok(src, dest):
 def install_system_headers():
   install_dirs = {
     ('include',): '',
-    ('lib', 'compiler-rt', 'include'): '',
     ('include', 'compat'): 'compat',
+    ('lib', 'compiler-rt', 'include'): '',
     ('lib', 'libunwind', 'include'): '',
     ('lib', 'libc', 'musl', 'arch', 'emscripten'): '',
-    ('lib', 'libcxx'): '',
-    ('include', 'libc'): '',
-    ('include', 'libcxx'): os.path.join('c++', 'v1'),
+    ('lib', 'libc', 'musl', 'include'): '',
+    ('lib', 'libcxx', 'include'): os.path.join('c++', 'v1'),
     ('lib', 'libcxxabi', 'include'): os.path.join('c++', 'v1'),
   }
 
@@ -1939,10 +1938,6 @@ def install_system_headers():
     dest = os.path.join(target_include_dir, dest)
     copytree_exist_ok(src, dest)
 
-  # TODO(sbc): Move these headers back into thier respecive source trees
-  for dirname in ['libc', 'libcxx']:
-    shutil.rmtree(os.path.join(target_include_dir, dirname))
-
   # Create a stamp file that signal the the header have been installed
   # Removing this file, or running `emcc --clear-cache` or running
   # `./embuilder build sysroot --force` will cause the re-installation of