diff --git a/src/libstd/thread/start.rs b/src/libstd/thread/start.rs
diff --git a/src/libstd/time/duration.rs b/src/libstd/time/duration.rs
diff --git a/src/libstd/time/mod.rs b/src/libstd/time/mod.rs
diff --git a/src/libsyntax/Cargo.toml b/src/libsyntax/Cargo.toml
diff --git a/src/libsystem/Cargo.toml b/src/libsystem/Cargo.toml
diff --git a/src/libsystem/backtrace.rs b/src/libsystem/backtrace.rs
diff --git a/src/libsystem/bind.rs b/src/libsystem/bind.rs
diff --git a/src/libsystem/c.rs b/src/libsystem/c.rs
diff --git a/src/libsystem/c_str.rs b/src/libsystem/c_str.rs
diff --git a/src/libstd/sys/common/args.rs → src/libsystem/common/args.rs b/src/libstd/sys/common/args.rs → src/libsystem/common/args.rs
diff --git a/src/libsystem/common/backtrace.rs b/src/libsystem/common/backtrace.rs
diff --git a/src/libsystem/common/c.rs b/src/libsystem/common/c.rs
diff --git a/src/libstd/sys/common/condvar.rs → src/libsystem/common/condvar.rs b/src/libstd/sys/common/condvar.rs → src/libsystem/common/condvar.rs
diff --git a/src/libstd/sys/common/dwarf/eh.rs → src/libsystem/common/dwarf/eh.rs b/src/libstd/sys/common/dwarf/eh.rs → src/libsystem/common/dwarf/eh.rs
diff --git a/src/libstd/sys/common/dwarf/mod.rs → src/libsystem/common/dwarf/mod.rs b/src/libstd/sys/common/dwarf/mod.rs → src/libsystem/common/dwarf/mod.rs
diff --git a/src/libstd/sys/common/gnu/libbacktrace.rs → src/libsystem/common/gnu/libbacktrace.rs b/src/libstd/sys/common/gnu/libbacktrace.rs → src/libsystem/common/gnu/libbacktrace.rs
diff --git a/src/libstd/sys/common/gnu/mod.rs → src/libsystem/common/gnu/mod.rs b/src/libstd/sys/common/gnu/mod.rs → src/libsystem/common/gnu/mod.rs
diff --git a/src/libstd/sys/common/libunwind.rs → src/libsystem/common/libunwind.rs b/src/libstd/sys/common/libunwind.rs → src/libsystem/common/libunwind.rs
diff --git a/src/libstd/sys/common/mod.rs → src/libsystem/common/mod.rs b/src/libstd/sys/common/mod.rs → src/libsystem/common/mod.rs
diff --git a/src/libstd/sys/common/mutex.rs → src/libsystem/common/mutex.rs b/src/libstd/sys/common/mutex.rs → src/libsystem/common/mutex.rs
diff --git a/src/libsystem/common/net/addr.rs b/src/libsystem/common/net/addr.rs
diff --git a/src/libsystem/common/net/ip.rs b/src/libsystem/common/net/ip.rs
diff --git a/src/libsystem/common/net/mod.rs b/src/libsystem/common/net/mod.rs
diff --git a/src/libsystem/common/once.rs b/src/libsystem/common/once.rs
diff --git a/src/libsystem/common/rt.rs b/src/libsystem/common/rt.rs
diff --git a/src/libstd/sys/common/rwlock.rs → src/libsystem/common/rwlock.rs b/src/libstd/sys/common/rwlock.rs → src/libsystem/common/rwlock.rs
diff --git a/src/libsystem/common/thread_local.rs b/src/libsystem/common/thread_local.rs
diff --git a/src/libstd/sys/common/unwind/gcc.rs → src/libsystem/common/unwind/gcc.rs b/src/libstd/sys/common/unwind/gcc.rs → src/libsystem/common/unwind/gcc.rs
diff --git a/src/libstd/sys/common/unwind/mod.rs → src/libsystem/common/unwind/mod.rs b/src/libstd/sys/common/unwind/mod.rs → src/libsystem/common/unwind/mod.rs
diff --git a/src/libstd/sys/common/unwind/seh.rs → src/libsystem/common/unwind/seh.rs b/src/libstd/sys/common/unwind/seh.rs → src/libsystem/common/unwind/seh.rs
diff --git a/src/libstd/sys/common/unwind/seh64_gnu.rs → src/libsystem/common/unwind/seh64_gnu.rs b/src/libstd/sys/common/unwind/seh64_gnu.rs → src/libsystem/common/unwind/seh64_gnu.rs
diff --git a/src/libsystem/deps.rs b/src/libsystem/deps.rs
diff --git a/src/libsystem/deps/backtrace/Cargo.toml b/src/libsystem/deps/backtrace/Cargo.toml
diff --git a/src/libsystem/deps/backtrace/build.rs b/src/libsystem/deps/backtrace/build.rs
diff --git a/src/libsystem/deps/backtrace/lib.rs b/src/libsystem/deps/backtrace/lib.rs
diff --git a/src/libsystem/deps/compiler-rt/Cargo.toml b/src/libsystem/deps/compiler-rt/Cargo.toml
diff --git a/src/libsystem/deps/compiler-rt/build.rs b/src/libsystem/deps/compiler-rt/build.rs
diff --git a/src/libsystem/deps/compiler-rt/lib.rs b/src/libsystem/deps/compiler-rt/lib.rs
diff --git a/src/libsystem/deps/dummy.rs b/src/libsystem/deps/dummy.rs
diff --git a/src/libsystem/deps/rust_builtin/Cargo.toml b/src/libsystem/deps/rust_builtin/Cargo.toml
diff --git a/src/libsystem/deps/rust_builtin/build.rs b/src/libsystem/deps/rust_builtin/build.rs
diff --git a/src/libsystem/deps/rust_builtin/lib.rs b/src/libsystem/deps/rust_builtin/lib.rs
diff --git a/src/libsystem/deps/rust_builtin/rust_android_dummy.c b/src/libsystem/deps/rust_builtin/rust_android_dummy.c
diff --git a/src/libsystem/deps/rust_builtin/rust_android_dummy.h b/src/libsystem/deps/rust_builtin/rust_android_dummy.h
diff --git a/src/libsystem/deps/rust_builtin/rust_builtin.c b/src/libsystem/deps/rust_builtin/rust_builtin.c
diff --git a/src/libsystem/dynamic_lib.rs b/src/libsystem/dynamic_lib.rs
diff --git a/src/libsystem/env.rs b/src/libsystem/env.rs
diff --git a/src/libsystem/error.rs b/src/libsystem/error.rs
diff --git a/src/libsystem/fs.rs b/src/libsystem/fs.rs
diff --git a/src/libsystem/inner.rs b/src/libsystem/inner.rs
diff --git a/src/libsystem/io.rs b/src/libsystem/io.rs
diff --git a/src/libsystem/lib.rs b/src/libsystem/lib.rs
diff --git a/src/libsystem/net.rs b/src/libsystem/net.rs
diff --git a/src/libsystem/none.rs b/src/libsystem/none.rs
diff --git a/src/libstd/os/android/mod.rs → src/libsystem/os/android/mod.rs b/src/libstd/os/android/mod.rs → src/libsystem/os/android/mod.rs
diff --git a/src/libstd/os/android/raw.rs → src/libsystem/os/android/raw.rs b/src/libstd/os/android/raw.rs → src/libsystem/os/android/raw.rs
diff --git a/src/libstd/os/bitrig/mod.rs → src/libsystem/os/bitrig/mod.rs b/src/libstd/os/bitrig/mod.rs → src/libsystem/os/bitrig/mod.rs
diff --git a/src/libstd/os/bitrig/raw.rs → src/libsystem/os/bitrig/raw.rs b/src/libstd/os/bitrig/raw.rs → src/libsystem/os/bitrig/raw.rs
diff --git a/src/libstd/os/dragonfly/mod.rs → src/libsystem/os/dragonfly/mod.rs b/src/libstd/os/dragonfly/mod.rs → src/libsystem/os/dragonfly/mod.rs
diff --git a/src/libstd/os/dragonfly/raw.rs → src/libsystem/os/dragonfly/raw.rs b/src/libstd/os/dragonfly/raw.rs → src/libsystem/os/dragonfly/raw.rs
diff --git a/src/libstd/os/freebsd/mod.rs → src/libsystem/os/freebsd/mod.rs b/src/libstd/os/freebsd/mod.rs → src/libsystem/os/freebsd/mod.rs
diff --git a/src/libstd/os/freebsd/raw.rs → src/libsystem/os/freebsd/raw.rs b/src/libstd/os/freebsd/raw.rs → src/libsystem/os/freebsd/raw.rs
diff --git a/src/libstd/os/ios/mod.rs → src/libsystem/os/ios/mod.rs b/src/libstd/os/ios/mod.rs → src/libsystem/os/ios/mod.rs
diff --git a/src/libstd/os/ios/raw.rs → src/libsystem/os/ios/raw.rs b/src/libstd/os/ios/raw.rs → src/libsystem/os/ios/raw.rs
diff --git a/src/libstd/os/linux/mod.rs → src/libsystem/os/linux/mod.rs b/src/libstd/os/linux/mod.rs → src/libsystem/os/linux/mod.rs
diff --git a/src/libstd/os/linux/raw.rs → src/libsystem/os/linux/raw.rs b/src/libstd/os/linux/raw.rs → src/libsystem/os/linux/raw.rs
diff --git a/src/libstd/os/macos/mod.rs → src/libsystem/os/macos/mod.rs b/src/libstd/os/macos/mod.rs → src/libsystem/os/macos/mod.rs
diff --git a/src/libstd/os/macos/raw.rs → src/libsystem/os/macos/raw.rs b/src/libstd/os/macos/raw.rs → src/libsystem/os/macos/raw.rs
diff --git a/src/libstd/os/mod.rs → src/libsystem/os/mod.rs b/src/libstd/os/mod.rs → src/libsystem/os/mod.rs
diff --git a/src/libstd/os/nacl/mod.rs → src/libsystem/os/nacl/mod.rs b/src/libstd/os/nacl/mod.rs → src/libsystem/os/nacl/mod.rs
diff --git a/src/libstd/os/nacl/raw.rs → src/libsystem/os/nacl/raw.rs b/src/libstd/os/nacl/raw.rs → src/libsystem/os/nacl/raw.rs
diff --git a/src/libstd/os/netbsd/mod.rs → src/libsystem/os/netbsd/mod.rs b/src/libstd/os/netbsd/mod.rs → src/libsystem/os/netbsd/mod.rs
diff --git a/src/libstd/os/netbsd/raw.rs → src/libsystem/os/netbsd/raw.rs b/src/libstd/os/netbsd/raw.rs → src/libsystem/os/netbsd/raw.rs
diff --git a/src/libstd/os/openbsd/mod.rs → src/libsystem/os/openbsd/mod.rs b/src/libstd/os/openbsd/mod.rs → src/libsystem/os/openbsd/mod.rs
diff --git a/src/libstd/os/openbsd/raw.rs → src/libsystem/os/openbsd/raw.rs b/src/libstd/os/openbsd/raw.rs → src/libsystem/os/openbsd/raw.rs
diff --git a/src/libstd/os/raw.rs → src/libsystem/os/raw.rs b/src/libstd/os/raw.rs → src/libsystem/os/raw.rs
diff --git a/src/libsystem/os_str.rs b/src/libsystem/os_str.rs
diff --git a/src/libsystem/path.rs b/src/libsystem/path.rs
diff --git a/src/libsystem/process.rs b/src/libsystem/process.rs
diff --git a/src/libsystem/rand.rs b/src/libsystem/rand.rs
diff --git a/src/libsystem/rt.rs b/src/libsystem/rt.rs
diff --git a/src/libsystem/stack_overflow.rs b/src/libsystem/stack_overflow.rs
diff --git a/src/libsystem/stdio.rs b/src/libsystem/stdio.rs
diff --git a/src/libsystem/sync.rs b/src/libsystem/sync.rs
diff --git a/src/libsystem/thread.rs b/src/libsystem/thread.rs
diff --git a/src/libsystem/thread_local.rs b/src/libsystem/thread_local.rs
diff --git a/src/libsystem/time.rs b/src/libsystem/time.rs
diff --git a/src/libstd/sys/unix/backtrace/mod.rs → src/libsystem/unix/backtrace/mod.rs b/src/libstd/sys/unix/backtrace/mod.rs → src/libsystem/unix/backtrace/mod.rs
diff --git a/...std/sys/unix/backtrace/printing/dladdr.rs → ...bsystem/unix/backtrace/printing/dladdr.rs b/...std/sys/unix/backtrace/printing/dladdr.rs → ...bsystem/unix/backtrace/printing/dladdr.rs
diff --git a/...libstd/sys/unix/backtrace/printing/gnu.rs → src/libsystem/unix/backtrace/printing/gnu.rs b/...libstd/sys/unix/backtrace/printing/gnu.rs → src/libsystem/unix/backtrace/printing/gnu.rs
diff --git a/...libstd/sys/unix/backtrace/printing/mod.rs → src/libsystem/unix/backtrace/printing/mod.rs b/...libstd/sys/unix/backtrace/printing/mod.rs → src/libsystem/unix/backtrace/printing/mod.rs
diff --git a/...ys/unix/backtrace/tracing/backtrace_fn.rs → ...em/unix/backtrace/tracing/backtrace_fn.rs b/...ys/unix/backtrace/tracing/backtrace_fn.rs → ...em/unix/backtrace/tracing/backtrace_fn.rs
diff --git a/...ibstd/sys/unix/backtrace/tracing/gcc_s.rs → ...libsystem/unix/backtrace/tracing/gcc_s.rs b/...ibstd/sys/unix/backtrace/tracing/gcc_s.rs → ...libsystem/unix/backtrace/tracing/gcc_s.rs
diff --git a/src/libstd/sys/unix/backtrace/tracing/mod.rs → src/libsystem/unix/backtrace/tracing/mod.rs b/src/libstd/sys/unix/backtrace/tracing/mod.rs → src/libsystem/unix/backtrace/tracing/mod.rs
diff --git a/src/libstd/sys/unix/c.rs → src/libsystem/unix/c.rs b/src/libstd/sys/unix/c.rs → src/libsystem/unix/c.rs
diff --git a/src/libstd/sys/unix/condvar.rs → src/libsystem/unix/condvar.rs b/src/libstd/sys/unix/condvar.rs → src/libsystem/unix/condvar.rs
diff --git a/src/libstd/rtdeps.rs → src/libsystem/unix/deps.rs b/src/libstd/rtdeps.rs → src/libsystem/unix/deps.rs
diff --git a/src/libsystem/unix/dynamic_lib.rs b/src/libsystem/unix/dynamic_lib.rs
diff --git a/src/libsystem/unix/env.rs b/src/libsystem/unix/env.rs
diff --git a/src/libsystem/unix/error.rs b/src/libsystem/unix/error.rs
diff --git a/src/libsystem/unix/ext/ffi.rs b/src/libsystem/unix/ext/ffi.rs
diff --git a/src/libstd/sys/unix/ext/fs.rs → src/libsystem/unix/ext/fs.rs b/src/libstd/sys/unix/ext/fs.rs → src/libsystem/unix/ext/fs.rs
diff --git a/src/libsystem/unix/ext/io.rs b/src/libsystem/unix/ext/io.rs
diff --git a/src/libstd/sys/unix/ext/mod.rs → src/libsystem/unix/ext/mod.rs b/src/libstd/sys/unix/ext/mod.rs → src/libsystem/unix/ext/mod.rs
diff --git a/src/libsystem/unix/ext/process.rs b/src/libsystem/unix/ext/process.rs
diff --git a/src/libsystem/unix/fd.rs b/src/libsystem/unix/fd.rs
diff --git a/src/libstd/sys/unix/fs.rs → src/libsystem/unix/fs.rs b/src/libstd/sys/unix/fs.rs → src/libsystem/unix/fs.rs
diff --git a/src/libstd/sys/unix/mod.rs → src/libsystem/unix/mod.rs b/src/libstd/sys/unix/mod.rs → src/libsystem/unix/mod.rs
diff --git a/src/libstd/sys/unix/mutex.rs → src/libsystem/unix/mutex.rs b/src/libstd/sys/unix/mutex.rs → src/libsystem/unix/mutex.rs
diff --git a/src/libstd/sys/unix/net.rs → src/libsystem/unix/net.rs b/src/libstd/sys/unix/net.rs → src/libsystem/unix/net.rs
diff --git a/src/libsystem/unix/os.rs b/src/libsystem/unix/os.rs
diff --git a/src/libstd/sys/unix/os_str.rs → src/libsystem/unix/os_str.rs b/src/libstd/sys/unix/os_str.rs → src/libsystem/unix/os_str.rs
diff --git a/src/libsystem/unix/path.rs b/src/libsystem/unix/path.rs
diff --git a/src/libstd/sys/unix/pipe.rs → src/libsystem/unix/pipe.rs b/src/libstd/sys/unix/pipe.rs → src/libsystem/unix/pipe.rs
diff --git a/src/libstd/sys/unix/process.rs → src/libsystem/unix/process.rs b/src/libstd/sys/unix/process.rs → src/libsystem/unix/process.rs
diff --git a/src/libsystem/unix/rand.rs b/src/libsystem/unix/rand.rs
diff --git a/src/libstd/sys/unix/ext/raw.rs → src/libsystem/unix/raw.rs b/src/libstd/sys/unix/ext/raw.rs → src/libsystem/unix/raw.rs
diff --git a/src/libsystem/unix/rt.rs b/src/libsystem/unix/rt.rs
diff --git a/src/libstd/sys/unix/rwlock.rs → src/libsystem/unix/rwlock.rs b/src/libstd/sys/unix/rwlock.rs → src/libsystem/unix/rwlock.rs
diff --git a/src/libstd/sys/unix/stack_overflow.rs → src/libsystem/unix/stack_overflow.rs b/src/libstd/sys/unix/stack_overflow.rs → src/libsystem/unix/stack_overflow.rs
diff --git a/src/libsystem/unix/stdio.rs b/src/libsystem/unix/stdio.rs
diff --git a/src/libstd/sys/unix/sync.rs → src/libsystem/unix/sync.rs b/src/libstd/sys/unix/sync.rs → src/libsystem/unix/sync.rs
diff --git a/src/libstd/sys/unix/thread.rs → src/libsystem/unix/thread.rs b/src/libstd/sys/unix/thread.rs → src/libsystem/unix/thread.rs
diff --git a/src/libstd/sys/unix/thread_local.rs → src/libsystem/unix/thread_local.rs b/src/libstd/sys/unix/thread_local.rs → src/libsystem/unix/thread_local.rs
diff --git a/src/libstd/sys/unix/time.rs → src/libsystem/unix/time.rs b/src/libstd/sys/unix/time.rs → src/libsystem/unix/time.rs
diff --git a/src/libsystem/unwind.rs b/src/libsystem/unwind.rs
diff --git a/src/libstd/sys/windows/backtrace.rs → src/libsystem/windows/backtrace.rs b/src/libstd/sys/windows/backtrace.rs → src/libsystem/windows/backtrace.rs
diff --git a/src/libstd/sys/windows/c.rs → src/libsystem/windows/c.rs b/src/libstd/sys/windows/c.rs → src/libsystem/windows/c.rs
diff --git a/src/libstd/sys/windows/compat.rs → src/libsystem/windows/compat.rs b/src/libstd/sys/windows/compat.rs → src/libsystem/windows/compat.rs
diff --git a/src/libstd/sys/windows/condvar.rs → src/libsystem/windows/condvar.rs b/src/libstd/sys/windows/condvar.rs → src/libsystem/windows/condvar.rs
diff --git a/src/libsystem/windows/dynamic_lib.rs b/src/libsystem/windows/dynamic_lib.rs
diff --git a/src/libstd/sys/windows/fs.rs → src/libsystem/windows/fs.rs b/src/libstd/sys/windows/fs.rs → src/libsystem/windows/fs.rs
diff --git a/src/libstd/sys/windows/handle.rs → src/libsystem/windows/handle.rs b/src/libstd/sys/windows/handle.rs → src/libsystem/windows/handle.rs
diff --git a/src/libstd/sys/windows/mod.rs → src/libsystem/windows/mod.rs b/src/libstd/sys/windows/mod.rs → src/libsystem/windows/mod.rs
diff --git a/src/libstd/sys/windows/mutex.rs → src/libsystem/windows/mutex.rs b/src/libstd/sys/windows/mutex.rs → src/libsystem/windows/mutex.rs
diff --git a/src/libstd/sys/windows/net.rs → src/libsystem/windows/net.rs b/src/libstd/sys/windows/net.rs → src/libsystem/windows/net.rs
diff --git a/src/libstd/sys/windows/os.rs → src/libsystem/windows/os.rs b/src/libstd/sys/windows/os.rs → src/libsystem/windows/os.rs
diff --git a/src/libstd/sys/windows/os_str.rs → src/libsystem/windows/os_str.rs b/src/libstd/sys/windows/os_str.rs → src/libsystem/windows/os_str.rs
diff --git a/src/libsystem/windows/path.rs b/src/libsystem/windows/path.rs
diff --git a/src/libstd/sys/windows/pipe.rs → src/libsystem/windows/pipe.rs b/src/libstd/sys/windows/pipe.rs → src/libsystem/windows/pipe.rs
diff --git a/src/libstd/sys/windows/printing/gnu.rs → src/libsystem/windows/printing/gnu.rs b/src/libstd/sys/windows/printing/gnu.rs → src/libsystem/windows/printing/gnu.rs
diff --git a/src/libstd/sys/windows/printing/msvc.rs → src/libsystem/windows/printing/msvc.rs b/src/libstd/sys/windows/printing/msvc.rs → src/libsystem/windows/printing/msvc.rs
diff --git a/src/libstd/sys/windows/process.rs → src/libsystem/windows/process.rs b/src/libstd/sys/windows/process.rs → src/libsystem/windows/process.rs
diff --git a/src/libsystem/windows/rand.rs b/src/libsystem/windows/rand.rs
diff --git a/src/libstd/sys/windows/rwlock.rs → src/libsystem/windows/rwlock.rs b/src/libstd/sys/windows/rwlock.rs → src/libsystem/windows/rwlock.rs
diff --git a/src/libstd/sys/windows/stack_overflow.rs → src/libsystem/windows/stack_overflow.rs b/src/libstd/sys/windows/stack_overflow.rs → src/libsystem/windows/stack_overflow.rs
diff --git a/src/libstd/sys/windows/stdio.rs → src/libsystem/windows/stdio.rs b/src/libstd/sys/windows/stdio.rs → src/libsystem/windows/stdio.rs
diff --git a/src/libstd/sys/windows/thread.rs → src/libsystem/windows/thread.rs b/src/libstd/sys/windows/thread.rs → src/libsystem/windows/thread.rs
diff --git a/src/libstd/sys/windows/thread_local.rs → src/libsystem/windows/thread_local.rs b/src/libstd/sys/windows/thread_local.rs → src/libsystem/windows/thread_local.rs
diff --git a/src/libstd/sys/windows/time.rs → src/libsystem/windows/time.rs b/src/libstd/sys/windows/time.rs → src/libsystem/windows/time.rs
diff --git a/src/libstd/sys/common/wtf8.rs → src/libsystem/wtf8.rs b/src/libstd/sys/common/wtf8.rs → src/libsystem/wtf8.rs
diff --git a/src/libterm/Cargo.toml b/src/libterm/Cargo.toml
diff --git a/src/libtest/Cargo.toml b/src/libtest/Cargo.toml
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp