diff --git a/src/libstd/os/raw.rs → src/libstd/sys/os/raw.rs b/src/libstd/os/raw.rs → src/libstd/sys/os/raw.rs
diff --git a/src/libstd/sys/unix/ext/ffi.rs → src/libstd/sys/os/unix/ffi.rs b/src/libstd/sys/unix/ext/ffi.rs → src/libstd/sys/os/unix/ffi.rs
diff --git a/src/libstd/sys/unix/ext/fs.rs → src/libstd/sys/os/unix/fs.rs b/src/libstd/sys/unix/ext/fs.rs → src/libstd/sys/os/unix/fs.rs
diff --git a/src/libstd/sys/unix/ext/io.rs → src/libstd/sys/os/unix/io.rs b/src/libstd/sys/unix/ext/io.rs → src/libstd/sys/os/unix/io.rs
diff --git a/src/libstd/sys/unix/ext/mod.rs → src/libstd/sys/os/unix/mod.rs b/src/libstd/sys/unix/ext/mod.rs → src/libstd/sys/os/unix/mod.rs
diff --git a/src/libstd/sys/unix/ext/process.rs → src/libstd/sys/os/unix/process.rs b/src/libstd/sys/unix/ext/process.rs → src/libstd/sys/os/unix/process.rs
diff --git a/src/libstd/sys/windows/ext/ffi.rs → src/libstd/sys/os/windows/ffi.rs b/src/libstd/sys/windows/ext/ffi.rs → src/libstd/sys/os/windows/ffi.rs
diff --git a/src/libstd/sys/windows/ext/fs.rs → src/libstd/sys/os/windows/fs.rs b/src/libstd/sys/windows/ext/fs.rs → src/libstd/sys/os/windows/fs.rs
diff --git a/src/libstd/sys/windows/ext/io.rs → src/libstd/sys/os/windows/io.rs b/src/libstd/sys/windows/ext/io.rs → src/libstd/sys/os/windows/io.rs
diff --git a/src/libstd/sys/windows/ext/mod.rs → src/libstd/sys/os/windows/mod.rs b/src/libstd/sys/windows/ext/mod.rs → src/libstd/sys/os/windows/mod.rs
diff --git a/src/libstd/sys/windows/ext/process.rs → src/libstd/sys/os/windows/process.rs b/src/libstd/sys/windows/ext/process.rs → src/libstd/sys/os/windows/process.rs
diff --git a/src/libstd/sys/windows/ext/raw.rs → src/libstd/sys/os/windows/raw.rs b/src/libstd/sys/windows/ext/raw.rs → src/libstd/sys/os/windows/raw.rs
diff --git a/src/libstd/sys/path.rs b/src/libstd/sys/path.rs
diff --git a/src/libstd/sys/process.rs b/src/libstd/sys/process.rs
diff --git a/src/libstd/sys/thread_local.rs b/src/libstd/sys/thread_local.rs
diff --git a/src/libstd/sys/common/args.rs → src/libstd/sys/unix/args.rs b/src/libstd/sys/common/args.rs → src/libstd/sys/unix/args.rs
diff --git a/src/libstd/sys/unix/backtrace/mod.rs b/src/libstd/sys/unix/backtrace/mod.rs
diff --git a/src/libstd/sys/unix/backtrace/printing/gnu.rs b/src/libstd/sys/unix/backtrace/printing/gnu.rs
diff --git a/src/libstd/sys/unix/backtrace/tracing/gcc_s.rs b/src/libstd/sys/unix/backtrace/tracing/gcc_s.rs
diff --git a/src/libstd/sys/unix/c.rs b/src/libstd/sys/unix/c.rs
diff --git a/src/libstd/sys/unix/condvar.rs b/src/libstd/sys/unix/condvar.rs
diff --git a/src/libstd/rtdeps.rs → src/libstd/sys/unix/deps.rs b/src/libstd/rtdeps.rs → src/libstd/sys/unix/deps.rs
diff --git a/src/libstd/sys/unix/dynamic_lib.rs b/src/libstd/sys/unix/dynamic_lib.rs
diff --git a/src/libstd/sys/unix/env.rs b/src/libstd/sys/unix/env.rs
diff --git a/src/libstd/sys/unix/error.rs b/src/libstd/sys/unix/error.rs
diff --git a/src/libstd/sys/unix/fd.rs b/src/libstd/sys/unix/fd.rs
diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs
diff --git a/src/libstd/sys/unix/mod.rs b/src/libstd/sys/unix/mod.rs
diff --git a/src/libstd/sys/unix/mutex.rs b/src/libstd/sys/unix/mutex.rs
diff --git a/src/libstd/sys/unix/net.rs b/src/libstd/sys/unix/net.rs
diff --git a/src/libstd/sys/unix/os.rs b/src/libstd/sys/unix/os.rs
diff --git a/src/libstd/sys/unix/os_str.rs b/src/libstd/sys/unix/os_str.rs
diff --git a/src/libstd/sys/unix/path.rs b/src/libstd/sys/unix/path.rs
diff --git a/src/libstd/sys/unix/pipe.rs b/src/libstd/sys/unix/pipe.rs
diff --git a/src/libstd/sys/unix/process.rs b/src/libstd/sys/unix/process.rs
diff --git a/src/libstd/sys/unix/rand.rs b/src/libstd/sys/unix/rand.rs
diff --git a/src/libstd/sys/unix/ext/raw.rs → src/libstd/sys/unix/raw.rs b/src/libstd/sys/unix/ext/raw.rs → src/libstd/sys/unix/raw.rs
diff --git a/src/libstd/sys/unix/rt.rs b/src/libstd/sys/unix/rt.rs
diff --git a/src/libstd/sys/unix/rwlock.rs b/src/libstd/sys/unix/rwlock.rs
diff --git a/src/libstd/sys/unix/stack_overflow.rs b/src/libstd/sys/unix/stack_overflow.rs
diff --git a/src/libstd/sys/unix/stdio.rs b/src/libstd/sys/unix/stdio.rs
diff --git a/src/libstd/sys/unix/sync.rs b/src/libstd/sys/unix/sync.rs
diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs
diff --git a/src/libstd/sys/unix/thread_local.rs b/src/libstd/sys/unix/thread_local.rs
diff --git a/src/libstd/sys/unix/time.rs b/src/libstd/sys/unix/time.rs
diff --git a/src/libstd/sys/windows/backtrace.rs b/src/libstd/sys/windows/backtrace.rs
diff --git a/src/libstd/sys/windows/c.rs b/src/libstd/sys/windows/c.rs
diff --git a/src/libstd/sys/windows/compat.rs b/src/libstd/sys/windows/compat.rs
diff --git a/src/libstd/sys/windows/condvar.rs b/src/libstd/sys/windows/condvar.rs
diff --git a/src/libstd/sys/windows/deps.rs b/src/libstd/sys/windows/deps.rs
diff --git a/src/libstd/sys/windows/dynamic_lib.rs b/src/libstd/sys/windows/dynamic_lib.rs
diff --git a/src/libstd/sys/windows/os.rs → src/libstd/sys/windows/env.rs b/src/libstd/sys/windows/os.rs → src/libstd/sys/windows/env.rs
diff --git a/src/libstd/sys/windows/error.rs b/src/libstd/sys/windows/error.rs
diff --git a/src/libstd/sys/windows/fs.rs b/src/libstd/sys/windows/fs.rs
diff --git a/src/libstd/sys/windows/handle.rs b/src/libstd/sys/windows/handle.rs
diff --git a/src/libstd/sys/windows/mod.rs b/src/libstd/sys/windows/mod.rs
diff --git a/src/libstd/sys/windows/mutex.rs b/src/libstd/sys/windows/mutex.rs
diff --git a/src/libstd/sys/windows/net.rs b/src/libstd/sys/windows/net.rs
diff --git a/src/libstd/sys/windows/path.rs b/src/libstd/sys/windows/path.rs
diff --git a/src/libstd/sys/windows/pipe.rs b/src/libstd/sys/windows/pipe.rs
diff --git a/src/libstd/sys/windows/printing/gnu.rs b/src/libstd/sys/windows/printing/gnu.rs
diff --git a/src/libstd/sys/windows/printing/msvc.rs b/src/libstd/sys/windows/printing/msvc.rs
diff --git a/src/libstd/sys/windows/process.rs b/src/libstd/sys/windows/process.rs
diff --git a/src/libstd/sys/windows/rand.rs b/src/libstd/sys/windows/rand.rs
diff --git a/src/libstd/sys/windows/rt.rs b/src/libstd/sys/windows/rt.rs
diff --git a/src/libstd/sys/windows/rwlock.rs b/src/libstd/sys/windows/rwlock.rs
diff --git a/src/libstd/sys/windows/stack_overflow.rs b/src/libstd/sys/windows/stack_overflow.rs
diff --git a/src/libstd/sys/windows/stdio.rs b/src/libstd/sys/windows/stdio.rs
diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs
diff --git a/src/libstd/sys/windows/thread_local.rs b/src/libstd/sys/windows/thread_local.rs
diff --git a/src/libstd/sys/windows/time.rs b/src/libstd/sys/windows/time.rs
diff --git a/src/libstd/sys/common/wtf8.rs → src/libstd/sys/wtf8.rs b/src/libstd/sys/common/wtf8.rs → src/libstd/sys/wtf8.rs
diff --git a/src/libstd/thread/info.rs b/src/libstd/thread/info.rs
diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs
diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs
diff --git a/src/libstd/thread/scoped_tls.rs b/src/libstd/thread/scoped_tls.rs
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