diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml
index 5e94a83a3a..79dfab50c8 100644
--- a/.builds/freebsd.yml
+++ b/.builds/freebsd.yml
@@ -13,28 +13,28 @@ tasks:
   - test: |
       cd zig/build
       bin/zig test ../test/stage1/behavior.zig
-      bin/zig test ../std/special/compiler_rt/index.zig
+      bin/zig test ../std/special/compiler_rt.zig
 
       bin/zig test ../test/stage1/behavior.zig --library c
-      bin/zig test ../std/special/compiler_rt/index.zig --library c
+      bin/zig test ../std/special/compiler_rt.zig --library c
 
       bin/zig test ../test/stage1/behavior.zig --release-fast
-      bin/zig test ../std/special/compiler_rt/index.zig --release-fast
+      bin/zig test ../std/special/compiler_rt.zig --release-fast
 
       bin/zig test ../test/stage1/behavior.zig --release-fast --library c
-      bin/zig test ../std/special/compiler_rt/index.zig --release-fast --library c
+      bin/zig test ../std/special/compiler_rt.zig --release-fast --library c
 
       bin/zig test ../test/stage1/behavior.zig --release-small --library c
-      bin/zig test ../std/special/compiler_rt/index.zig --release-small --library c
+      bin/zig test ../std/special/compiler_rt.zig --release-small --library c
 
       bin/zig test ../test/stage1/behavior.zig --release-small
-      bin/zig test ../std/special/compiler_rt/index.zig --release-small
+      bin/zig test ../std/special/compiler_rt.zig --release-small
 
       bin/zig test ../test/stage1/behavior.zig --release-safe
-      bin/zig test ../std/special/compiler_rt/index.zig --release-safe
+      bin/zig test ../std/special/compiler_rt.zig --release-safe
 
       bin/zig test ../test/stage1/behavior.zig --release-safe --library c
-      bin/zig test ../std/special/compiler_rt/index.zig --release-safe --library c
+      bin/zig test ../std/special/compiler_rt.zig --release-safe --library c
       # TODO enable all tests
       #bin/zig build --build-file ../build.zig test
       # TODO integrate with the download page updater and make a
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2d9f392ef..8c8defa5ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -439,7 +439,7 @@ set(ZIG_CPP_SOURCES
 
 set(ZIG_STD_FILES
     "array_list.zig"
-    "atomic/index.zig"
+    "atomic.zig"
     "atomic/int.zig"
     "atomic/queue.zig"
     "atomic/stack.zig"
@@ -449,17 +449,17 @@ set(ZIG_STD_FILES
     "buffer.zig"
     "build.zig"
     "build/fmt.zig"
+    "c.zig"
     "c/darwin.zig"
     "c/freebsd.zig"
-    "c/index.zig"
     "c/linux.zig"
     "c/netbsd.zig"
     "c/windows.zig"
     "coff.zig"
+    "crypto.zig"
     "crypto/blake2.zig"
     "crypto/chacha20.zig"
     "crypto/hmac.zig"
-    "crypto/index.zig"
     "crypto/md5.zig"
     "crypto/poly1305.zig"
     "crypto/sha1.zig"
@@ -467,8 +467,8 @@ set(ZIG_STD_FILES
     "crypto/sha3.zig"
     "crypto/x25519.zig"
     "cstr.zig"
+    "debug.zig"
     "debug/failing_allocator.zig"
-    "debug/index.zig"
     "dwarf.zig"
     "dynamic_library.zig"
     "elf.zig"
@@ -485,25 +485,25 @@ set(ZIG_STD_FILES
     "event/net.zig"
     "event/rwlock.zig"
     "event/rwlocked.zig"
+    "fmt.zig"
+    "fmt/errol.zig"
     "fmt/errol/enum3.zig"
-    "fmt/errol/index.zig"
     "fmt/errol/lookup.zig"
-    "fmt/index.zig"
     "fmt/parse_float.zig"
+    "hash.zig"
     "hash/adler.zig"
     "hash/crc.zig"
     "hash/fnv.zig"
-    "hash/index.zig"
     "hash/siphash.zig"
     "hash_map.zig"
     "heap.zig"
-    "index.zig"
     "io.zig"
     "io/seekable_stream.zig"
     "json.zig"
     "lazy_init.zig"
     "linked_list.zig"
     "macho.zig"
+    "math.zig"
     "math/acos.zig"
     "math/acosh.zig"
     "math/asin.zig"
@@ -511,10 +511,11 @@ set(ZIG_STD_FILES
     "math/atan.zig"
     "math/atan2.zig"
     "math/atanh.zig"
-    "math/big/index.zig"
+    "math/big.zig"
     "math/big/int.zig"
     "math/cbrt.zig"
     "math/ceil.zig"
+    "math/complex.zig"
     "math/complex/abs.zig"
     "math/complex/acos.zig"
     "math/complex/acosh.zig"
@@ -527,7 +528,6 @@ set(ZIG_STD_FILES
     "math/complex/cos.zig"
     "math/complex/cosh.zig"
     "math/complex/exp.zig"
-    "math/complex/index.zig"
     "math/complex/ldexp.zig"
     "math/complex/log.zig"
     "math/complex/pow.zig"
@@ -550,7 +550,6 @@ set(ZIG_STD_FILES
     "math/frexp.zig"
     "math/hypot.zig"
     "math/ilogb.zig"
-    "math/index.zig"
     "math/inf.zig"
     "math/isfinite.zig"
     "math/isinf.zig"
@@ -575,33 +574,33 @@ set(ZIG_STD_FILES
     "math/tanh.zig"
     "math/trunc.zig"
     "mem.zig"
-    "meta/index.zig"
+    "meta.zig"
     "meta/trait.zig"
     "mutex.zig"
     "net.zig"
+    "os.zig"
     "os/child_process.zig"
     "os/darwin.zig"
     "os/darwin/errno.zig"
     "os/epoch.zig"
     "os/file.zig"
+    "os/freebsd.zig"
     "os/freebsd/errno.zig"
-    "os/freebsd/index.zig"
     "os/get_app_data_dir.zig"
     "os/get_user_id.zig"
-    "os/index.zig"
+    "os/linux.zig"
     "os/linux/arm64.zig"
     "os/linux/errno.zig"
-    "os/linux/index.zig"
     "os/linux/vdso.zig"
     "os/linux/x86_64.zig"
+    "os/netbsd.zig"
     "os/netbsd/errno.zig"
-    "os/netbsd/index.zig"
     "os/path.zig"
     "os/time.zig"
     "os/uefi.zig"
+    "os/windows.zig"
     "os/windows/advapi32.zig"
     "os/windows/error.zig"
-    "os/windows/index.zig"
     "os/windows/kernel32.zig"
     "os/windows/ntdll.zig"
     "os/windows/ole32.zig"
@@ -610,7 +609,7 @@ set(ZIG_STD_FILES
     "os/zen.zig"
     "pdb.zig"
     "priority_queue.zig"
-    "rand/index.zig"
+    "rand.zig"
     "rand/ziggurat.zig"
     "segmented_list.zig"
     "sort.zig"
@@ -619,6 +618,7 @@ set(ZIG_STD_FILES
     "special/bootstrap_windows_tls.zig"
     "special/build_runner.zig"
     "special/builtin.zig"
+    "special/compiler_rt.zig"
     "special/compiler_rt/addXf3.zig"
     "special/compiler_rt/aulldiv.zig"
     "special/compiler_rt/aullrem.zig"
@@ -653,7 +653,6 @@ set(ZIG_STD_FILES
     "special/compiler_rt/floatuntidf.zig"
     "special/compiler_rt/floatuntisf.zig"
     "special/compiler_rt/floatuntitf.zig"
-    "special/compiler_rt/index.zig"
     "special/compiler_rt/muloti4.zig"
     "special/compiler_rt/multi3.zig"
     "special/compiler_rt/truncXfYf2.zig"
@@ -671,10 +670,11 @@ set(ZIG_STD_FILES
     "special/test_runner.zig"
     "spinlock.zig"
     "statically_initialized_mutex.zig"
+    "std.zig"
     "testing.zig"
     "unicode.zig"
+    "zig.zig"
     "zig/ast.zig"
-    "zig/index.zig"
     "zig/parse.zig"
     "zig/parse_string_literal.zig"
     "zig/render.zig"
diff --git a/build.zig b/build.zig
index 756ec53708..6acf08a0e5 100644
--- a/build.zig
+++ b/build.zig
@@ -115,9 +115,9 @@ pub fn build(b: *Builder) !void {
 
     test_step.dependOn(tests.addPkgTests(b, test_filter, "test/stage1/behavior.zig", "behavior", "Run the behavior tests", modes));
 
-    test_step.dependOn(tests.addPkgTests(b, test_filter, "std/index.zig", "std", "Run the standard library tests", modes));
+    test_step.dependOn(tests.addPkgTests(b, test_filter, "std/std.zig", "std", "Run the standard library tests", modes));
 
-    test_step.dependOn(tests.addPkgTests(b, test_filter, "std/special/compiler_rt/index.zig", "compiler-rt", "Run the compiler_rt tests", modes));
+    test_step.dependOn(tests.addPkgTests(b, test_filter, "std/special/compiler_rt.zig", "compiler-rt", "Run the compiler_rt tests", modes));
 
     test_step.dependOn(tests.addCompareOutputTests(b, test_filter, modes));
     test_step.dependOn(tests.addBuildExampleTests(b, test_filter, modes));
diff --git a/src-self-hosted/compilation.zig b/src-self-hosted/compilation.zig
index a59588353c..478edce020 100644
--- a/src-self-hosted/compilation.zig
+++ b/src-self-hosted/compilation.zig
@@ -533,7 +533,7 @@ pub const Compilation = struct {
             const basename = std.os.path.basename(root_src);
 
             comp.root_package = try Package.create(comp.arena(), dirname, basename);
-            comp.std_package = try Package.create(comp.arena(), comp.zig_std_dir, "index.zig");
+            comp.std_package = try Package.create(comp.arena(), comp.zig_std_dir, "std.zig");
             try comp.root_package.add("std", comp.std_package);
         } else {
             comp.root_package = try Package.create(comp.arena(), ".", "");
diff --git a/src-self-hosted/introspect.zig b/src-self-hosted/introspect.zig
index 0a7f63b4f1..8f859a82ce 100644
--- a/src-self-hosted/introspect.zig
+++ b/src-self-hosted/introspect.zig
@@ -11,7 +11,7 @@ pub fn testZigInstallPrefix(allocator: *mem.Allocator, test_path: []const u8) ![
     const test_zig_dir = try os.path.join(allocator, [][]const u8{ test_path, "lib", "zig" });
     errdefer allocator.free(test_zig_dir);
 
-    const test_index_file = try os.path.join(allocator, [][]const u8{ test_zig_dir, "std", "index.zig" });
+    const test_index_file = try os.path.join(allocator, [][]const u8{ test_zig_dir, "std", "std.zig" });
     defer allocator.free(test_index_file);
 
     var file = try os.File.openRead(test_index_file);
diff --git a/src/codegen.cpp b/src/codegen.cpp
index 071dd1fde4..89e370329f 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -162,7 +162,7 @@ CodeGen *codegen_create(Buf *main_pkg_path, Buf *root_src_path, const ZigTarget
         }
 
         g->root_package = new_package(buf_ptr(root_pkg_path), buf_ptr(rel_root_src_path), "");
-        g->std_package = new_package(buf_ptr(g->zig_std_dir), "index.zig", "std");
+        g->std_package = new_package(buf_ptr(g->zig_std_dir), "std.zig", "std");
         g->root_package->package_table.put(buf_create_from_str("std"), g->std_package);
     } else {
         g->root_package = new_package(".", "", "");
diff --git a/src/compiler.cpp b/src/compiler.cpp
index 0d4dff5d50..8c2f9cdf60 100644
--- a/src/compiler.cpp
+++ b/src/compiler.cpp
@@ -78,8 +78,8 @@ static bool test_zig_install_prefix(Buf *test_path, Buf *out_zig_lib_dir) {
     Buf std_buf = BUF_INIT;
     buf_init_from_str(&std_buf, "std");
 
-    Buf index_zig_buf = BUF_INIT;
-    buf_init_from_str(&index_zig_buf, "index.zig");
+    Buf std_zig_buf = BUF_INIT;
+    buf_init_from_str(&std_zig_buf, "std.zig");
 
     Buf test_lib_dir = BUF_INIT;
     Buf test_zig_dir = BUF_INIT;
@@ -89,7 +89,7 @@ static bool test_zig_install_prefix(Buf *test_path, Buf *out_zig_lib_dir) {
     os_path_join(test_path, &lib_buf, &test_lib_dir);
     os_path_join(&test_lib_dir, &zig_buf, &test_zig_dir);
     os_path_join(&test_zig_dir, &std_buf, &test_std_dir);
-    os_path_join(&test_std_dir, &index_zig_buf, &test_index_file);
+    os_path_join(&test_std_dir, &std_zig_buf, &test_index_file);
 
     int err;
     bool exists;
diff --git a/src/link.cpp b/src/link.cpp
index 2e30dc6230..bd1879da1a 100644
--- a/src/link.cpp
+++ b/src/link.cpp
@@ -87,10 +87,8 @@ static Buf *build_a(CodeGen *parent_gen, const char *aname) {
 }
 
 static Buf *build_compiler_rt(CodeGen *parent_gen) {
-    Buf *dir_path = buf_alloc();
-    os_path_join(parent_gen->zig_std_special_dir, buf_create_from_str("compiler_rt"), dir_path);
     Buf *full_path = buf_alloc();
-    os_path_join(dir_path, buf_create_from_str("index.zig"), full_path);
+    os_path_join(parent_gen->zig_std_special_dir, buf_create_from_str("compiler_rt.zig"), full_path);
 
     return build_a_raw(parent_gen, "compiler_rt", full_path);
 }
diff --git a/std/array_list.zig b/std/array_list.zig
index e2535d6393..2c9da50972 100644
--- a/std/array_list.zig
+++ b/std/array_list.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const debug = std.debug;
 const assert = debug.assert;
 const testing = std.testing;
@@ -406,6 +406,6 @@ const Item = struct {
 
 test "std.ArrayList: ArrayList(T) of struct T" {
     var root = Item{ .integer = 1, .sub_items = ArrayList(Item).init(debug.global_allocator) };
-    try root.sub_items.append( Item{ .integer = 42, .sub_items = ArrayList(Item).init(debug.global_allocator) } );
+    try root.sub_items.append(Item{ .integer = 42, .sub_items = ArrayList(Item).init(debug.global_allocator) });
     testing.expect(root.sub_items.items[0].integer == 42);
 }
diff --git a/std/atomic.zig b/std/atomic.zig
new file mode 100644
index 0000000000..6f7b4fe75d
--- /dev/null
+++ b/std/atomic.zig
@@ -0,0 +1,9 @@
+pub const Stack = @import("atomic/stack.zig").Stack;
+pub const Queue = @import("atomic/queue.zig").Queue;
+pub const Int = @import("atomic/int.zig").Int;
+
+test "std.atomic" {
+    _ = @import("atomic/stack.zig");
+    _ = @import("atomic/queue.zig");
+    _ = @import("atomic/int.zig");
+}
diff --git a/std/atomic/index.zig b/std/atomic/index.zig
deleted file mode 100644
index a94cff1973..0000000000
--- a/std/atomic/index.zig
+++ /dev/null
@@ -1,9 +0,0 @@
-pub const Stack = @import("stack.zig").Stack;
-pub const Queue = @import("queue.zig").Queue;
-pub const Int = @import("int.zig").Int;
-
-test "std.atomic" {
-    _ = @import("stack.zig");
-    _ = @import("queue.zig");
-    _ = @import("int.zig");
-}
diff --git a/std/atomic/queue.zig b/std/atomic/queue.zig
index bdc86c0981..431a96e64b 100644
--- a/std/atomic/queue.zig
+++ b/std/atomic/queue.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const AtomicOrder = builtin.AtomicOrder;
 const AtomicRmwOp = builtin.AtomicRmwOp;
diff --git a/std/atomic/stack.zig b/std/atomic/stack.zig
index 4d0d5075e0..8ae6c997aa 100644
--- a/std/atomic/stack.zig
+++ b/std/atomic/stack.zig
@@ -68,7 +68,7 @@ pub fn Stack(comptime T: type) type {
     };
 }
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const Context = struct {
     allocator: *std.mem.Allocator,
     stack: *Stack(i32),
diff --git a/std/base64.zig b/std/base64.zig
index cfe8ea95f8..0e44f9d4fe 100644
--- a/std/base64.zig
+++ b/std/base64.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const assert = std.debug.assert;
 const testing = std.testing;
 const mem = std.mem;
diff --git a/std/buf_map.zig b/std/buf_map.zig
index f8d3d5e04d..be0666d972 100644
--- a/std/buf_map.zig
+++ b/std/buf_map.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const HashMap = std.HashMap;
 const mem = std.mem;
 const Allocator = mem.Allocator;
diff --git a/std/buf_set.zig b/std/buf_set.zig
index 484b4953b9..807b9db35d 100644
--- a/std/buf_set.zig
+++ b/std/buf_set.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const HashMap = @import("hash_map.zig").HashMap;
 const mem = @import("mem.zig");
 const Allocator = mem.Allocator;
diff --git a/std/buffer.zig b/std/buffer.zig
index 371655f1e5..8706dfc320 100644
--- a/std/buffer.zig
+++ b/std/buffer.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const debug = std.debug;
 const mem = std.mem;
 const Allocator = mem.Allocator;
diff --git a/std/build.zig b/std/build.zig
index b7f76a53af..f2e53cce10 100644
--- a/std/build.zig
+++ b/std/build.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const builtin = @import("builtin");
 const io = std.io;
 const mem = std.mem;
diff --git a/std/build/fmt.zig b/std/build/fmt.zig
index ec0536dd34..f3b8e08180 100644
--- a/std/build/fmt.zig
+++ b/std/build/fmt.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const build = @import("../build.zig");
 const Step = build.Step;
 const Builder = build.Builder;
diff --git a/std/c/index.zig b/std/c.zig
similarity index 93%
rename from std/c/index.zig
rename to std/c.zig
index 74cdd884ca..c7c8a9c550 100644
--- a/std/c/index.zig
+++ b/std/c.zig
@@ -2,14 +2,14 @@ const builtin = @import("builtin");
 const Os = builtin.Os;
 
 pub use switch (builtin.os) {
-    Os.linux => @import("linux.zig"),
-    Os.windows => @import("windows.zig"),
-    Os.macosx, Os.ios => @import("darwin.zig"),
-    Os.freebsd => @import("freebsd.zig"),
-    Os.netbsd => @import("netbsd.zig"),
+    Os.linux => @import("c/linux.zig"),
+    Os.windows => @import("c/windows.zig"),
+    Os.macosx, Os.ios => @import("c/darwin.zig"),
+    Os.freebsd => @import("c/freebsd.zig"),
+    Os.netbsd => @import("c/netbsd.zig"),
     else => empty_import,
 };
-const empty_import = @import("../empty.zig");
+const empty_import = @import("empty.zig");
 
 // TODO https://github.com/ziglang/zig/issues/265 on this whole file
 
diff --git a/std/c/darwin.zig b/std/c/darwin.zig
index 940d949985..0e92e8d411 100644
--- a/std/c/darwin.zig
+++ b/std/c/darwin.zig
@@ -163,7 +163,7 @@ pub const Kevent = extern struct {
 // sys/types.h on macos uses #pragma pack(4) so these checks are
 // to make sure the struct is laid out the same. These values were
 // produced from C code using the offsetof macro.
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const assert = std.debug.assert;
 
 comptime {
diff --git a/std/coff.zig b/std/coff.zig
index 53bd2a4b7a..c31d2d8233 100644
--- a/std/coff.zig
+++ b/std/coff.zig
@@ -1,5 +1,5 @@
 const builtin = @import("builtin");
-const std = @import("index.zig");
+const std = @import("std.zig");
 const io = std.io;
 const mem = std.mem;
 const os = std.os;
diff --git a/std/crypto.zig b/std/crypto.zig
new file mode 100644
index 0000000000..2429441fc7
--- /dev/null
+++ b/std/crypto.zig
@@ -0,0 +1,45 @@
+pub const Md5 = @import("crypto/md5.zig").Md5;
+pub const Sha1 = @import("crypto/sha1.zig").Sha1;
+
+const sha2 = @import("crypto/sha2.zig");
+pub const Sha224 = sha2.Sha224;
+pub const Sha256 = sha2.Sha256;
+pub const Sha384 = sha2.Sha384;
+pub const Sha512 = sha2.Sha512;
+
+const sha3 = @import("crypto/sha3.zig");
+pub const Sha3_224 = sha3.Sha3_224;
+pub const Sha3_256 = sha3.Sha3_256;
+pub const Sha3_384 = sha3.Sha3_384;
+pub const Sha3_512 = sha3.Sha3_512;
+
+const blake2 = @import("crypto/blake2.zig");
+pub const Blake2s224 = blake2.Blake2s224;
+pub const Blake2s256 = blake2.Blake2s256;
+pub const Blake2b384 = blake2.Blake2b384;
+pub const Blake2b512 = blake2.Blake2b512;
+
+const hmac = @import("crypto/hmac.zig");
+pub const HmacMd5 = hmac.HmacMd5;
+pub const HmacSha1 = hmac.HmacSha1;
+pub const HmacSha256 = hmac.HmacSha256;
+pub const HmacBlake2s256 = hmac.HmacBlake2s256;
+
+const import_chaCha20 = @import("crypto/chacha20.zig");
+pub const chaCha20IETF = import_chaCha20.chaCha20IETF;
+pub const chaCha20With64BitNonce = import_chaCha20.chaCha20With64BitNonce;
+
+pub const Poly1305 = @import("crypto/poly1305.zig").Poly1305;
+pub const X25519 = @import("crypto/x25519.zig").X25519;
+
+test "crypto" {
+    _ = @import("crypto/blake2.zig");
+    _ = @import("crypto/chacha20.zig");
+    _ = @import("crypto/hmac.zig");
+    _ = @import("crypto/md5.zig");
+    _ = @import("crypto/poly1305.zig");
+    _ = @import("crypto/sha1.zig");
+    _ = @import("crypto/sha2.zig");
+    _ = @import("crypto/sha3.zig");
+    _ = @import("crypto/x25519.zig");
+}
diff --git a/std/crypto/blake2.zig b/std/crypto/blake2.zig
index 6eebaf7a96..e9f617261f 100644
--- a/std/crypto/blake2.zig
+++ b/std/crypto/blake2.zig
@@ -1,7 +1,7 @@
 const mem = @import("../mem.zig");
-const math = @import("../math/index.zig");
+const math = @import("../math.zig");
 const endian = @import("../endian.zig");
-const debug = @import("../debug/index.zig");
+const debug = @import("../debug.zig");
 const builtin = @import("builtin");
 const htest = @import("test.zig");
 
diff --git a/std/crypto/chacha20.zig b/std/crypto/chacha20.zig
index d964f4c03d..78ef700bdf 100644
--- a/std/crypto/chacha20.zig
+++ b/std/crypto/chacha20.zig
@@ -1,6 +1,6 @@
 // Based on public domain Supercop by Daniel J. Bernstein
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const mem = std.mem;
 const endian = std.endian;
 const assert = std.debug.assert;
diff --git a/std/crypto/hmac.zig b/std/crypto/hmac.zig
index 51dda1b1ea..69c1b86386 100644
--- a/std/crypto/hmac.zig
+++ b/std/crypto/hmac.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const crypto = std.crypto;
 const debug = std.debug;
 const mem = std.mem;
diff --git a/std/crypto/index.zig b/std/crypto/index.zig
deleted file mode 100644
index 3855bd8dd3..0000000000
--- a/std/crypto/index.zig
+++ /dev/null
@@ -1,45 +0,0 @@
-pub const Md5 = @import("md5.zig").Md5;
-pub const Sha1 = @import("sha1.zig").Sha1;
-
-const sha2 = @import("sha2.zig");
-pub const Sha224 = sha2.Sha224;
-pub const Sha256 = sha2.Sha256;
-pub const Sha384 = sha2.Sha384;
-pub const Sha512 = sha2.Sha512;
-
-const sha3 = @import("sha3.zig");
-pub const Sha3_224 = sha3.Sha3_224;
-pub const Sha3_256 = sha3.Sha3_256;
-pub const Sha3_384 = sha3.Sha3_384;
-pub const Sha3_512 = sha3.Sha3_512;
-
-const blake2 = @import("blake2.zig");
-pub const Blake2s224 = blake2.Blake2s224;
-pub const Blake2s256 = blake2.Blake2s256;
-pub const Blake2b384 = blake2.Blake2b384;
-pub const Blake2b512 = blake2.Blake2b512;
-
-const hmac = @import("hmac.zig");
-pub const HmacMd5 = hmac.HmacMd5;
-pub const HmacSha1 = hmac.HmacSha1;
-pub const HmacSha256 = hmac.HmacSha256;
-pub const HmacBlake2s256 = hmac.HmacBlake2s256;
-
-const import_chaCha20 = @import("chacha20.zig");
-pub const chaCha20IETF = import_chaCha20.chaCha20IETF;
-pub const chaCha20With64BitNonce = import_chaCha20.chaCha20With64BitNonce;
-
-pub const Poly1305 = @import("poly1305.zig").Poly1305;
-pub const X25519 = @import("x25519.zig").X25519;
-
-test "crypto" {
-    _ = @import("blake2.zig");
-    _ = @import("chacha20.zig");
-    _ = @import("hmac.zig");
-    _ = @import("md5.zig");
-    _ = @import("poly1305.zig");
-    _ = @import("sha1.zig");
-    _ = @import("sha2.zig");
-    _ = @import("sha3.zig");
-    _ = @import("x25519.zig");
-}
diff --git a/std/crypto/md5.zig b/std/crypto/md5.zig
index fe6877a58f..d27a3c1c33 100644
--- a/std/crypto/md5.zig
+++ b/std/crypto/md5.zig
@@ -1,9 +1,9 @@
 const mem = @import("../mem.zig");
-const math = @import("../math/index.zig");
+const math = @import("../math.zig");
 const endian = @import("../endian.zig");
 const builtin = @import("builtin");
-const debug = @import("../debug/index.zig");
-const fmt = @import("../fmt/index.zig");
+const debug = @import("../debug.zig");
+const fmt = @import("../fmt.zig");
 
 const RoundParam = struct {
     a: usize,
diff --git a/std/crypto/poly1305.zig b/std/crypto/poly1305.zig
index 64adb17c45..bd0b33e586 100644
--- a/std/crypto/poly1305.zig
+++ b/std/crypto/poly1305.zig
@@ -2,7 +2,7 @@
 //
 // https://monocypher.org/
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 
 const Endian = builtin.Endian;
diff --git a/std/crypto/sha1.zig b/std/crypto/sha1.zig
index 42beba6205..ee5c118b13 100644
--- a/std/crypto/sha1.zig
+++ b/std/crypto/sha1.zig
@@ -1,7 +1,7 @@
 const mem = @import("../mem.zig");
-const math = @import("../math/index.zig");
+const math = @import("../math.zig");
 const endian = @import("../endian.zig");
-const debug = @import("../debug/index.zig");
+const debug = @import("../debug.zig");
 const builtin = @import("builtin");
 
 const RoundParam = struct {
diff --git a/std/crypto/sha2.zig b/std/crypto/sha2.zig
index 615dd4a221..37b0b65dc6 100644
--- a/std/crypto/sha2.zig
+++ b/std/crypto/sha2.zig
@@ -1,7 +1,7 @@
 const mem = @import("../mem.zig");
-const math = @import("../math/index.zig");
+const math = @import("../math.zig");
 const endian = @import("../endian.zig");
-const debug = @import("../debug/index.zig");
+const debug = @import("../debug.zig");
 const builtin = @import("builtin");
 const htest = @import("test.zig");
 
diff --git a/std/crypto/sha3.zig b/std/crypto/sha3.zig
index 11d8e4be50..beebb3e65d 100644
--- a/std/crypto/sha3.zig
+++ b/std/crypto/sha3.zig
@@ -1,7 +1,7 @@
 const mem = @import("../mem.zig");
-const math = @import("../math/index.zig");
+const math = @import("../math.zig");
 const endian = @import("../endian.zig");
-const debug = @import("../debug/index.zig");
+const debug = @import("../debug.zig");
 const builtin = @import("builtin");
 const htest = @import("test.zig");
 
diff --git a/std/crypto/test.zig b/std/crypto/test.zig
index 258cdf7320..a0ddad6c83 100644
--- a/std/crypto/test.zig
+++ b/std/crypto/test.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const testing = std.testing;
 const mem = std.mem;
 const fmt = std.fmt;
diff --git a/std/crypto/throughput_test.zig b/std/crypto/throughput_test.zig
index 10ef1bcd48..73a2a86124 100644
--- a/std/crypto/throughput_test.zig
+++ b/std/crypto/throughput_test.zig
@@ -2,7 +2,7 @@ const builtin = @import("builtin");
 const std = @import("std");
 const time = std.os.time;
 const Timer = time.Timer;
-const crypto = @import("index.zig");
+const crypto = @import("../crypto.zig");
 
 const KiB = 1024;
 const MiB = 1024 * KiB;
diff --git a/std/crypto/x25519.zig b/std/crypto/x25519.zig
index 9349569f97..5d5d31267d 100644
--- a/std/crypto/x25519.zig
+++ b/std/crypto/x25519.zig
@@ -2,7 +2,7 @@
 //
 // https://monocypher.org/
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const fmt = std.fmt;
 
diff --git a/std/cstr.zig b/std/cstr.zig
index abd2eac48f..49d6373732 100644
--- a/std/cstr.zig
+++ b/std/cstr.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const builtin = @import("builtin");
 const debug = std.debug;
 const mem = std.mem;
diff --git a/std/debug/index.zig b/std/debug.zig
similarity index 99%
rename from std/debug/index.zig
rename to std/debug.zig
index 1523eea57c..df35a8e773 100644
--- a/std/debug/index.zig
+++ b/std/debug.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("std.zig");
 const math = std.math;
 const mem = std.mem;
 const io = std.io;
@@ -13,7 +13,7 @@ const ArrayList = std.ArrayList;
 const builtin = @import("builtin");
 const maxInt = std.math.maxInt;
 
-pub const FailingAllocator = @import("failing_allocator.zig").FailingAllocator;
+pub const FailingAllocator = @import("debug/failing_allocator.zig").FailingAllocator;
 pub const failing_allocator = &FailingAllocator.init(global_allocator, 0).allocator;
 
 pub const runtime_safety = switch (builtin.mode) {
diff --git a/std/debug/failing_allocator.zig b/std/debug/failing_allocator.zig
index e16dd21db4..82093dffda 100644
--- a/std/debug/failing_allocator.zig
+++ b/std/debug/failing_allocator.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const mem = std.mem;
 
 /// Allocator that fails after N allocations, useful for making sure out of
diff --git a/std/dynamic_library.zig b/std/dynamic_library.zig
index 66026b1f29..698b0eb216 100644
--- a/std/dynamic_library.zig
+++ b/std/dynamic_library.zig
@@ -1,7 +1,7 @@
 const builtin = @import("builtin");
 const Os = builtin.Os;
 
-const std = @import("index.zig");
+const std = @import("std.zig");
 const mem = std.mem;
 const cstr = std.cstr;
 const os = std.os;
diff --git a/std/elf.zig b/std/elf.zig
index 6a564c3283..d0ec5fb2ae 100644
--- a/std/elf.zig
+++ b/std/elf.zig
@@ -1,5 +1,5 @@
 const builtin = @import("builtin");
-const std = @import("index.zig");
+const std = @import("std.zig");
 const io = std.io;
 const os = std.os;
 const math = std.math;
diff --git a/std/event/channel.zig b/std/event/channel.zig
index 4af9bf612b..be5af49774 100644
--- a/std/event/channel.zig
+++ b/std/event/channel.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const assert = std.debug.assert;
 const testing = std.testing;
diff --git a/std/event/fs.zig b/std/event/fs.zig
index 6535945573..b923651b1b 100644
--- a/std/event/fs.zig
+++ b/std/event/fs.zig
@@ -1,5 +1,5 @@
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const event = std.event;
 const assert = std.debug.assert;
 const testing = std.testing;
@@ -404,11 +404,7 @@ pub async fn openPosix(
 
 pub async fn openRead(loop: *Loop, path: []const u8) os.File.OpenError!os.FileHandle {
     switch (builtin.os) {
-        builtin.Os.macosx,
-        builtin.Os.linux,
-        builtin.Os.freebsd,
-        builtin.Os.netbsd
-        => {
+        builtin.Os.macosx, builtin.Os.linux, builtin.Os.freebsd, builtin.Os.netbsd => {
             const flags = posix.O_LARGEFILE | posix.O_RDONLY | posix.O_CLOEXEC;
             return await (async openPosix(loop, path, flags, os.File.default_mode) catch unreachable);
         },
@@ -876,10 +872,7 @@ pub fn Watch(comptime V: type) type {
 
         pub async fn addFile(self: *Self, file_path: []const u8, value: V) !?V {
             switch (builtin.os) {
-                builtin.Os.macosx,
-                builtin.Os.freebsd,
-                builtin.Os.netbsd
-                => return await (async addFileKEvent(self, file_path, value) catch unreachable),
+                builtin.Os.macosx, builtin.Os.freebsd, builtin.Os.netbsd => return await (async addFileKEvent(self, file_path, value) catch unreachable),
                 builtin.Os.linux => return await (async addFileLinux(self, file_path, value) catch unreachable),
                 builtin.Os.windows => return await (async addFileWindows(self, file_path, value) catch unreachable),
                 else => @compileError("Unsupported OS"),
diff --git a/std/event/future.zig b/std/event/future.zig
index 66acac5ad7..0e1b928898 100644
--- a/std/event/future.zig
+++ b/std/event/future.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const assert = std.debug.assert;
 const testing = std.testing;
 const builtin = @import("builtin");
diff --git a/std/event/group.zig b/std/event/group.zig
index 25e79640cb..455d1bd60c 100644
--- a/std/event/group.zig
+++ b/std/event/group.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const Lock = std.event.Lock;
 const Loop = std.event.Loop;
diff --git a/std/event/io.zig b/std/event/io.zig
index b11550f7aa..29419a792e 100644
--- a/std/event/io.zig
+++ b/std/event/io.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const Allocator = std.mem.Allocator;
 const assert = std.debug.assert;
diff --git a/std/event/lock.zig b/std/event/lock.zig
index d6a246cee5..031b2adf19 100644
--- a/std/event/lock.zig
+++ b/std/event/lock.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const assert = std.debug.assert;
 const testing = std.testing;
diff --git a/std/event/locked.zig b/std/event/locked.zig
index 6718b1bf9c..1ceaa33530 100644
--- a/std/event/locked.zig
+++ b/std/event/locked.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const Lock = std.event.Lock;
 const Loop = std.event.Loop;
 
diff --git a/std/event/loop.zig b/std/event/loop.zig
index 55a1538f0c..a327d03792 100644
--- a/std/event/loop.zig
+++ b/std/event/loop.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const assert = std.debug.assert;
 const testing = std.testing;
diff --git a/std/event/net.zig b/std/event/net.zig
index 48461c3d81..687c119920 100644
--- a/std/event/net.zig
+++ b/std/event/net.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const testing = std.testing;
 const event = std.event;
diff --git a/std/event/rwlock.zig b/std/event/rwlock.zig
index 26ccd12b73..25b0f0e74b 100644
--- a/std/event/rwlock.zig
+++ b/std/event/rwlock.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const assert = std.debug.assert;
 const testing = std.testing;
diff --git a/std/event/rwlocked.zig b/std/event/rwlocked.zig
index d305b1791e..0448e0298e 100644
--- a/std/event/rwlocked.zig
+++ b/std/event/rwlocked.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const RwLock = std.event.RwLock;
 const Loop = std.event.Loop;
 
diff --git a/std/fmt/index.zig b/std/fmt.zig
similarity index 99%
rename from std/fmt/index.zig
rename to std/fmt.zig
index 4f864b3662..e01ba2033b 100644
--- a/std/fmt/index.zig
+++ b/std/fmt.zig
@@ -1,11 +1,11 @@
-const std = @import("../index.zig");
+const std = @import("std.zig");
 const math = std.math;
 const debug = std.debug;
 const assert = debug.assert;
 const testing = std.testing;
 const mem = std.mem;
 const builtin = @import("builtin");
-const errol = @import("errol/index.zig");
+const errol = @import("fmt/errol.zig");
 const lossyCast = std.math.lossyCast;
 
 const max_int_digits = 65;
@@ -858,10 +858,10 @@ test "fmt.parseUnsigned" {
     testing.expectError(error.Overflow, parseUnsigned(u2, "4", 16));
 }
 
-pub const parseFloat = @import("parse_float.zig").parseFloat;
+pub const parseFloat = @import("fmt/parse_float.zig").parseFloat;
 
 test "fmt.parseFloat" {
-    _ = @import("parse_float.zig");
+    _ = @import("fmt/parse_float.zig");
 }
 
 pub fn charToDigit(c: u8, radix: u8) (error{InvalidCharacter}!u8) {
diff --git a/std/fmt/errol/index.zig b/std/fmt/errol.zig
similarity index 98%
rename from std/fmt/errol/index.zig
rename to std/fmt/errol.zig
index 0fdb1c4ab8..9304c54874 100644
--- a/std/fmt/errol/index.zig
+++ b/std/fmt/errol.zig
@@ -1,8 +1,8 @@
-const std = @import("../../index.zig");
-const enum3 = @import("enum3.zig").enum3;
-const enum3_data = @import("enum3.zig").enum3_data;
-const lookup_table = @import("lookup.zig").lookup_table;
-const HP = @import("lookup.zig").HP;
+const std = @import("../std.zig");
+const enum3 = @import("errol/enum3.zig").enum3;
+const enum3_data = @import("errol/enum3.zig").enum3_data;
+const lookup_table = @import("errol/lookup.zig").lookup_table;
+const HP = @import("errol/lookup.zig").HP;
 const math = std.math;
 const mem = std.mem;
 const assert = std.debug.assert;
diff --git a/std/fmt/parse_float.zig b/std/fmt/parse_float.zig
index de9619efe2..c13977dc42 100644
--- a/std/fmt/parse_float.zig
+++ b/std/fmt/parse_float.zig
@@ -29,7 +29,7 @@
 // - Only supports round-to-zero
 // - Does not handle denormals
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 
 const max_digits = 25;
 
diff --git a/std/hash/index.zig b/std/hash.zig
similarity index 51%
rename from std/hash/index.zig
rename to std/hash.zig
index 8cce35f3c5..19ee62824d 100644
--- a/std/hash/index.zig
+++ b/std/hash.zig
@@ -1,22 +1,22 @@
-const adler = @import("adler.zig");
+const adler = @import("hash/adler.zig");
 pub const Adler32 = adler.Adler32;
 
 // pub for polynomials + generic crc32 construction
-pub const crc = @import("crc.zig");
+pub const crc = @import("hash/crc.zig");
 pub const Crc32 = crc.Crc32;
 
-const fnv = @import("fnv.zig");
+const fnv = @import("hash/fnv.zig");
 pub const Fnv1a_32 = fnv.Fnv1a_32;
 pub const Fnv1a_64 = fnv.Fnv1a_64;
 pub const Fnv1a_128 = fnv.Fnv1a_128;
 
-const siphash = @import("siphash.zig");
+const siphash = @import("hash/siphash.zig");
 pub const SipHash64 = siphash.SipHash64;
 pub const SipHash128 = siphash.SipHash128;
 
 test "hash" {
-    _ = @import("adler.zig");
-    _ = @import("crc.zig");
-    _ = @import("fnv.zig");
-    _ = @import("siphash.zig");
+    _ = @import("hash/adler.zig");
+    _ = @import("hash/crc.zig");
+    _ = @import("hash/fnv.zig");
+    _ = @import("hash/siphash.zig");
 }
diff --git a/std/hash/adler.zig b/std/hash/adler.zig
index 78f960367a..e95203cc6c 100644
--- a/std/hash/adler.zig
+++ b/std/hash/adler.zig
@@ -3,7 +3,7 @@
 // https://tools.ietf.org/html/rfc1950#section-9
 // https://github.com/madler/zlib/blob/master/adler32.c
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const testing = std.testing;
 
 pub const Adler32 = struct {
diff --git a/std/hash/crc.zig b/std/hash/crc.zig
index 9bea358bf1..53b4262c93 100644
--- a/std/hash/crc.zig
+++ b/std/hash/crc.zig
@@ -5,7 +5,7 @@
 // - Crc32SmallWithPoly uses only 64 bytes of memory but is slower. Be aware that this is
 //   still moderately fast just slow relative to the slicing approach.
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const debug = std.debug;
 const testing = std.testing;
 
diff --git a/std/hash/fnv.zig b/std/hash/fnv.zig
index 6876b636f6..8094134e19 100644
--- a/std/hash/fnv.zig
+++ b/std/hash/fnv.zig
@@ -4,7 +4,7 @@
 //
 // https://tools.ietf.org/html/draft-eastlake-fnv-14
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const testing = std.testing;
 
 pub const Fnv1a_32 = Fnv1a(u32, 0x01000193, 0x811c9dc5);
diff --git a/std/hash/siphash.zig b/std/hash/siphash.zig
index c9a6128d35..77194c3e03 100644
--- a/std/hash/siphash.zig
+++ b/std/hash/siphash.zig
@@ -5,7 +5,7 @@
 //
 // https://131002.net/siphash/
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const assert = std.debug.assert;
 const testing = std.testing;
 const math = std.math;
diff --git a/std/hash_map.zig b/std/hash_map.zig
index 6ae9e8e2c3..d31fcdb597 100644
--- a/std/hash_map.zig
+++ b/std/hash_map.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const debug = std.debug;
 const assert = debug.assert;
 const testing = std.testing;
diff --git a/std/heap.zig b/std/heap.zig
index e257977f9d..e03e77a39c 100644
--- a/std/heap.zig
+++ b/std/heap.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const debug = std.debug;
 const assert = debug.assert;
 const testing = std.testing;
diff --git a/std/io.zig b/std/io.zig
index f6e3790af6..7756f36116 100644
--- a/std/io.zig
+++ b/std/io.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const builtin = @import("builtin");
 const Os = builtin.Os;
 const c = std.c;
diff --git a/std/io/seekable_stream.zig b/std/io/seekable_stream.zig
index a766f4fb89..5529e42ff1 100644
--- a/std/io/seekable_stream.zig
+++ b/std/io/seekable_stream.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const InStream = std.io.InStream;
 
 pub fn SeekableStream(comptime SeekErrorType: type, comptime GetSeekPosErrorType: type) type {
diff --git a/std/io_test.zig b/std/io_test.zig
index 87b970edf8..3c4c15ba12 100644
--- a/std/io_test.zig
+++ b/std/io_test.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const io = std.io;
 const meta = std.meta;
 const trait = std.trait;
@@ -34,8 +34,7 @@ test "write a file, read it, then delete it" {
         // make sure openWriteNoClobber doesn't harm the file
         if (os.File.openWriteNoClobber(tmp_file_name, os.File.default_mode)) |file| {
             unreachable;
-        }
-        else |err| {
+        } else |err| {
             std.debug.assert(err == os.File.OpenError.PathAlreadyExists);
         }
     }
@@ -180,7 +179,7 @@ test "BitInStream" {
     expect(out_bits == 16);
 
     _ = try bit_stream_be.readBits(u0, 0, &out_bits);
-    
+
     expect(0 == try bit_stream_be.readBits(u1, 1, &out_bits));
     expect(out_bits == 0);
     expectError(error.EndOfStream, bit_stream_be.readBitsNoEof(u1, 1));
@@ -212,7 +211,7 @@ test "BitInStream" {
     expect(out_bits == 16);
 
     _ = try bit_stream_le.readBits(u0, 0, &out_bits);
-    
+
     expect(0 == try bit_stream_le.readBits(u1, 1, &out_bits));
     expect(out_bits == 0);
     expectError(error.EndOfStream, bit_stream_le.readBitsNoEof(u1, 1));
@@ -281,7 +280,7 @@ test "BitStreams with File Stream" {
         var file_out_stream = &file_out.stream;
         const OutError = os.File.WriteError;
         var bit_stream = io.BitOutStream(builtin.endian, OutError).init(file_out_stream);
-        
+
         try bit_stream.writeBits(u2(1), 1);
         try bit_stream.writeBits(u5(2), 2);
         try bit_stream.writeBits(u128(3), 3);
@@ -298,7 +297,7 @@ test "BitStreams with File Stream" {
         var file_in_stream = &file_in.stream;
         const InError = os.File.ReadError;
         var bit_stream = io.BitInStream(builtin.endian, InError).init(file_in_stream);
-        
+
         var out_bits: usize = undefined;
 
         expect(1 == try bit_stream.readBits(u2, 1, &out_bits));
@@ -313,7 +312,7 @@ test "BitStreams with File Stream" {
         expect(out_bits == 5);
         expect(1 == try bit_stream.readBits(u1, 1, &out_bits));
         expect(out_bits == 1);
-        
+
         expectError(error.EndOfStream, bit_stream.readBitsNoEof(u1, 1));
     }
     try os.deleteFile(tmp_file_name);
@@ -322,14 +321,14 @@ test "BitStreams with File Stream" {
 fn testIntSerializerDeserializer(comptime endian: builtin.Endian, comptime is_packed: bool) !void {
     //@NOTE: if this test is taking too long, reduce the maximum tested bitsize
     const max_test_bitsize = 128;
-    
+
     const total_bytes = comptime blk: {
         var bytes = 0;
         comptime var i = 0;
         while (i <= max_test_bitsize) : (i += 1) bytes += (i / 8) + @boolToInt(i % 8 > 0);
         break :blk bytes * 2;
     };
-    
+
     var data_mem: [total_bytes]u8 = undefined;
     var out = io.SliceOutStream.init(data_mem[0..]);
     const OutError = io.SliceOutStream.Error;
@@ -386,12 +385,13 @@ test "Serializer/Deserializer Int" {
     try testIntSerializerDeserializer(builtin.Endian.Little, true);
 }
 
-fn testIntSerializerDeserializerInfNaN(comptime endian: builtin.Endian, 
-    comptime is_packed: bool) !void
-{
-    const mem_size = (16*2 + 32*2 + 64*2 + 128*2) / comptime meta.bitCount(u8);
+fn testIntSerializerDeserializerInfNaN(
+    comptime endian: builtin.Endian,
+    comptime is_packed: bool,
+) !void {
+    const mem_size = (16 * 2 + 32 * 2 + 64 * 2 + 128 * 2) / comptime meta.bitCount(u8);
     var data_mem: [mem_size]u8 = undefined;
-    
+
     var out = io.SliceOutStream.init(data_mem[0..]);
     const OutError = io.SliceOutStream.Error;
     var out_stream = &out.stream;
@@ -472,8 +472,6 @@ fn testSerializerDeserializer(comptime endian: builtin.Endian, comptime is_packe
         f_u2: u2,
     };
 
-    
-    
     //to test custom serialization
     const Custom = struct {
         f_f16: f16,
diff --git a/std/json.zig b/std/json.zig
index dd053e7635..551c3a8da7 100644
--- a/std/json.zig
+++ b/std/json.zig
@@ -2,7 +2,7 @@
 //
 // https://tools.ietf.org/html/rfc8259
 
-const std = @import("index.zig");
+const std = @import("std.zig");
 const debug = std.debug;
 const testing = std.testing;
 const mem = std.mem;
diff --git a/std/json_test.zig b/std/json_test.zig
index edc50be8cb..a323e6e979 100644
--- a/std/json_test.zig
+++ b/std/json_test.zig
@@ -3,7 +3,7 @@
 // Tests are taken from https://github.com/nst/JSONTestSuite
 // Read also http://seriot.ch/parsing_json.php for a good overview.
 
-const std = @import("index.zig");
+const std = @import("std.zig");
 
 fn ok(comptime s: []const u8) void {
     std.testing.expect(std.json.validate(s));
diff --git a/std/lazy_init.zig b/std/lazy_init.zig
index a09168786b..7beabb9cde 100644
--- a/std/lazy_init.zig
+++ b/std/lazy_init.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const builtin = @import("builtin");
 const assert = std.debug.assert;
 const testing = std.testing;
diff --git a/std/linked_list.zig b/std/linked_list.zig
index 86e5cd056e..c4ad525913 100644
--- a/std/linked_list.zig
+++ b/std/linked_list.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const debug = std.debug;
 const assert = debug.assert;
 const testing = std.testing;
diff --git a/std/math/index.zig b/std/math.zig
similarity index 84%
rename from std/math/index.zig
rename to std/math.zig
index 89f228d35e..cead685778 100644
--- a/std/math/index.zig
+++ b/std/math.zig
@@ -1,5 +1,5 @@
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("std.zig");
 const TypeId = builtin.TypeId;
 const assert = std.debug.assert;
 const testing = std.testing;
@@ -57,9 +57,9 @@ pub const nan_f128 = @bitCast(f128, nan_u128);
 pub const inf_u128 = u128(0x7fff0000000000000000000000000000);
 pub const inf_f128 = @bitCast(f128, inf_u128);
 
-pub const nan = @import("nan.zig").nan;
-pub const snan = @import("nan.zig").snan;
-pub const inf = @import("inf.zig").inf;
+pub const nan = @import("math/nan.zig").nan;
+pub const snan = @import("math/nan.zig").snan;
+pub const inf = @import("math/inf.zig").inf;
 
 pub fn approxEq(comptime T: type, x: T, y: T, epsilon: T) bool {
     assert(@typeId(T) == TypeId.Float);
@@ -111,109 +111,109 @@ pub fn raiseDivByZero() void {
     // Raise INEXACT fpu exception
 }
 
-pub const isNan = @import("isnan.zig").isNan;
-pub const isSignalNan = @import("isnan.zig").isSignalNan;
-pub const fabs = @import("fabs.zig").fabs;
-pub const ceil = @import("ceil.zig").ceil;
-pub const floor = @import("floor.zig").floor;
-pub const trunc = @import("trunc.zig").trunc;
-pub const round = @import("round.zig").round;
-pub const frexp = @import("frexp.zig").frexp;
-pub const frexp32_result = @import("frexp.zig").frexp32_result;
-pub const frexp64_result = @import("frexp.zig").frexp64_result;
-pub const modf = @import("modf.zig").modf;
-pub const modf32_result = @import("modf.zig").modf32_result;
-pub const modf64_result = @import("modf.zig").modf64_result;
-pub const copysign = @import("copysign.zig").copysign;
-pub const isFinite = @import("isfinite.zig").isFinite;
-pub const isInf = @import("isinf.zig").isInf;
-pub const isPositiveInf = @import("isinf.zig").isPositiveInf;
-pub const isNegativeInf = @import("isinf.zig").isNegativeInf;
-pub const isNormal = @import("isnormal.zig").isNormal;
-pub const signbit = @import("signbit.zig").signbit;
-pub const scalbn = @import("scalbn.zig").scalbn;
-pub const pow = @import("pow.zig").pow;
-pub const powi = @import("powi.zig").powi;
-pub const sqrt = @import("sqrt.zig").sqrt;
-pub const cbrt = @import("cbrt.zig").cbrt;
-pub const acos = @import("acos.zig").acos;
-pub const asin = @import("asin.zig").asin;
-pub const atan = @import("atan.zig").atan;
-pub const atan2 = @import("atan2.zig").atan2;
-pub const hypot = @import("hypot.zig").hypot;
-pub const exp = @import("exp.zig").exp;
-pub const exp2 = @import("exp2.zig").exp2;
-pub const expm1 = @import("expm1.zig").expm1;
-pub const ilogb = @import("ilogb.zig").ilogb;
-pub const ln = @import("ln.zig").ln;
-pub const log = @import("log.zig").log;
-pub const log2 = @import("log2.zig").log2;
-pub const log10 = @import("log10.zig").log10;
-pub const log1p = @import("log1p.zig").log1p;
-pub const fma = @import("fma.zig").fma;
-pub const asinh = @import("asinh.zig").asinh;
-pub const acosh = @import("acosh.zig").acosh;
-pub const atanh = @import("atanh.zig").atanh;
-pub const sinh = @import("sinh.zig").sinh;
-pub const cosh = @import("cosh.zig").cosh;
-pub const tanh = @import("tanh.zig").tanh;
-pub const cos = @import("cos.zig").cos;
-pub const sin = @import("sin.zig").sin;
-pub const tan = @import("tan.zig").tan;
+pub const isNan = @import("math/isnan.zig").isNan;
+pub const isSignalNan = @import("math/isnan.zig").isSignalNan;
+pub const fabs = @import("math/fabs.zig").fabs;
+pub const ceil = @import("math/ceil.zig").ceil;
+pub const floor = @import("math/floor.zig").floor;
+pub const trunc = @import("math/trunc.zig").trunc;
+pub const round = @import("math/round.zig").round;
+pub const frexp = @import("math/frexp.zig").frexp;
+pub const frexp32_result = @import("math/frexp.zig").frexp32_result;
+pub const frexp64_result = @import("math/frexp.zig").frexp64_result;
+pub const modf = @import("math/modf.zig").modf;
+pub const modf32_result = @import("math/modf.zig").modf32_result;
+pub const modf64_result = @import("math/modf.zig").modf64_result;
+pub const copysign = @import("math/copysign.zig").copysign;
+pub const isFinite = @import("math/isfinite.zig").isFinite;
+pub const isInf = @import("math/isinf.zig").isInf;
+pub const isPositiveInf = @import("math/isinf.zig").isPositiveInf;
+pub const isNegativeInf = @import("math/isinf.zig").isNegativeInf;
+pub const isNormal = @import("math/isnormal.zig").isNormal;
+pub const signbit = @import("math/signbit.zig").signbit;
+pub const scalbn = @import("math/scalbn.zig").scalbn;
+pub const pow = @import("math/pow.zig").pow;
+pub const powi = @import("math/powi.zig").powi;
+pub const sqrt = @import("math/sqrt.zig").sqrt;
+pub const cbrt = @import("math/cbrt.zig").cbrt;
+pub const acos = @import("math/acos.zig").acos;
+pub const asin = @import("math/asin.zig").asin;
+pub const atan = @import("math/atan.zig").atan;
+pub const atan2 = @import("math/atan2.zig").atan2;
+pub const hypot = @import("math/hypot.zig").hypot;
+pub const exp = @import("math/exp.zig").exp;
+pub const exp2 = @import("math/exp2.zig").exp2;
+pub const expm1 = @import("math/expm1.zig").expm1;
+pub const ilogb = @import("math/ilogb.zig").ilogb;
+pub const ln = @import("math/ln.zig").ln;
+pub const log = @import("math/log.zig").log;
+pub const log2 = @import("math/log2.zig").log2;
+pub const log10 = @import("math/log10.zig").log10;
+pub const log1p = @import("math/log1p.zig").log1p;
+pub const fma = @import("math/fma.zig").fma;
+pub const asinh = @import("math/asinh.zig").asinh;
+pub const acosh = @import("math/acosh.zig").acosh;
+pub const atanh = @import("math/atanh.zig").atanh;
+pub const sinh = @import("math/sinh.zig").sinh;
+pub const cosh = @import("math/cosh.zig").cosh;
+pub const tanh = @import("math/tanh.zig").tanh;
+pub const cos = @import("math/cos.zig").cos;
+pub const sin = @import("math/sin.zig").sin;
+pub const tan = @import("math/tan.zig").tan;
 
-pub const complex = @import("complex/index.zig");
+pub const complex = @import("math/complex.zig");
 pub const Complex = complex.Complex;
 
-pub const big = @import("big/index.zig");
+pub const big = @import("math/big.zig");
 
 test "math" {
-    _ = @import("nan.zig");
-    _ = @import("isnan.zig");
-    _ = @import("fabs.zig");
-    _ = @import("ceil.zig");
-    _ = @import("floor.zig");
-    _ = @import("trunc.zig");
-    _ = @import("round.zig");
-    _ = @import("frexp.zig");
-    _ = @import("modf.zig");
-    _ = @import("copysign.zig");
-    _ = @import("isfinite.zig");
-    _ = @import("isinf.zig");
-    _ = @import("isnormal.zig");
-    _ = @import("signbit.zig");
-    _ = @import("scalbn.zig");
-    _ = @import("pow.zig");
-    _ = @import("powi.zig");
-    _ = @import("sqrt.zig");
-    _ = @import("cbrt.zig");
-    _ = @import("acos.zig");
-    _ = @import("asin.zig");
-    _ = @import("atan.zig");
-    _ = @import("atan2.zig");
-    _ = @import("hypot.zig");
-    _ = @import("exp.zig");
-    _ = @import("exp2.zig");
-    _ = @import("expm1.zig");
-    _ = @import("ilogb.zig");
-    _ = @import("ln.zig");
-    _ = @import("log.zig");
-    _ = @import("log2.zig");
-    _ = @import("log10.zig");
-    _ = @import("log1p.zig");
-    _ = @import("fma.zig");
-    _ = @import("asinh.zig");
-    _ = @import("acosh.zig");
-    _ = @import("atanh.zig");
-    _ = @import("sinh.zig");
-    _ = @import("cosh.zig");
-    _ = @import("tanh.zig");
-    _ = @import("sin.zig");
-    _ = @import("cos.zig");
-    _ = @import("tan.zig");
+    _ = @import("math/nan.zig");
+    _ = @import("math/isnan.zig");
+    _ = @import("math/fabs.zig");
+    _ = @import("math/ceil.zig");
+    _ = @import("math/floor.zig");
+    _ = @import("math/trunc.zig");
+    _ = @import("math/round.zig");
+    _ = @import("math/frexp.zig");
+    _ = @import("math/modf.zig");
+    _ = @import("math/copysign.zig");
+    _ = @import("math/isfinite.zig");
+    _ = @import("math/isinf.zig");
+    _ = @import("math/isnormal.zig");
+    _ = @import("math/signbit.zig");
+    _ = @import("math/scalbn.zig");
+    _ = @import("math/pow.zig");
+    _ = @import("math/powi.zig");
+    _ = @import("math/sqrt.zig");
+    _ = @import("math/cbrt.zig");
+    _ = @import("math/acos.zig");
+    _ = @import("math/asin.zig");
+    _ = @import("math/atan.zig");
+    _ = @import("math/atan2.zig");
+    _ = @import("math/hypot.zig");
+    _ = @import("math/exp.zig");
+    _ = @import("math/exp2.zig");
+    _ = @import("math/expm1.zig");
+    _ = @import("math/ilogb.zig");
+    _ = @import("math/ln.zig");
+    _ = @import("math/log.zig");
+    _ = @import("math/log2.zig");
+    _ = @import("math/log10.zig");
+    _ = @import("math/log1p.zig");
+    _ = @import("math/fma.zig");
+    _ = @import("math/asinh.zig");
+    _ = @import("math/acosh.zig");
+    _ = @import("math/atanh.zig");
+    _ = @import("math/sinh.zig");
+    _ = @import("math/cosh.zig");
+    _ = @import("math/tanh.zig");
+    _ = @import("math/sin.zig");
+    _ = @import("math/cos.zig");
+    _ = @import("math/tan.zig");
 
-    _ = @import("complex/index.zig");
+    _ = @import("math/complex.zig");
 
-    _ = @import("big/index.zig");
+    _ = @import("math/big.zig");
 }
 
 pub fn floatMantissaBits(comptime T: type) comptime_int {
diff --git a/std/math/acos.zig b/std/math/acos.zig
index 734f7a8651..763d9d8abd 100644
--- a/std/math/acos.zig
+++ b/std/math/acos.zig
@@ -2,7 +2,7 @@
 //
 // - acos(x)   = nan if x < -1 or x > 1
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/acosh.zig b/std/math/acosh.zig
index a9c4a908ef..a2a9926863 100644
--- a/std/math/acosh.zig
+++ b/std/math/acosh.zig
@@ -4,7 +4,7 @@
 // - acosh(nan) = nan
 
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/asin.zig b/std/math/asin.zig
index c9dbdf704f..b01a1ac49e 100644
--- a/std/math/asin.zig
+++ b/std/math/asin.zig
@@ -3,7 +3,7 @@
 // - asin(+-0) = +-0
 // - asin(x)   = nan if x < -1 or x > 1
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/asinh.zig b/std/math/asinh.zig
index 05bd8d008e..cef9bfb23f 100644
--- a/std/math/asinh.zig
+++ b/std/math/asinh.zig
@@ -4,7 +4,7 @@
 // - asinh(+-inf) = +-inf
 // - asinh(nan)   = nan
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const maxInt = std.math.maxInt;
diff --git a/std/math/atan.zig b/std/math/atan.zig
index 72d17b4db2..ba5a11dd10 100644
--- a/std/math/atan.zig
+++ b/std/math/atan.zig
@@ -3,7 +3,7 @@
 // - atan(+-0)   = +-0
 // - atan(+-inf) = +-pi/2
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/atan2.zig b/std/math/atan2.zig
index 6e1f67cfbb..7f13507402 100644
--- a/std/math/atan2.zig
+++ b/std/math/atan2.zig
@@ -18,7 +18,7 @@
 //  atan2(+inf, x)    = +pi/2
 //  atan2(-inf, x)    = -pi/2
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/atanh.zig b/std/math/atanh.zig
index f2feab0207..9056064f5a 100644
--- a/std/math/atanh.zig
+++ b/std/math/atanh.zig
@@ -4,7 +4,7 @@
 // - atanh(x)   = nan if |x| > 1 with signal
 // - atanh(nan) = nan
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const maxInt = std.math.maxInt;
diff --git a/std/math/big.zig b/std/math/big.zig
new file mode 100644
index 0000000000..94b6d864e7
--- /dev/null
+++ b/std/math/big.zig
@@ -0,0 +1,5 @@
+pub use @import("big/int.zig");
+
+test "math.big" {
+    _ = @import("big/int.zig");
+}
diff --git a/std/math/big/index.zig b/std/math/big/index.zig
deleted file mode 100644
index 26fa538c4f..0000000000
--- a/std/math/big/index.zig
+++ /dev/null
@@ -1,5 +0,0 @@
-pub use @import("int.zig");
-
-test "math.big" {
-    _ = @import("int.zig");
-}
diff --git a/std/math/big/int.zig b/std/math/big/int.zig
index f21e5df8aa..7fca4a147f 100644
--- a/std/math/big/int.zig
+++ b/std/math/big/int.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const builtin = @import("builtin");
 const debug = std.debug;
 const testing = std.testing;
diff --git a/std/math/cbrt.zig b/std/math/cbrt.zig
index 957e026af4..9497255269 100644
--- a/std/math/cbrt.zig
+++ b/std/math/cbrt.zig
@@ -4,7 +4,7 @@
 // - cbrt(+-inf) = +-inf
 // - cbrt(nan)   = nan
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/ceil.zig b/std/math/ceil.zig
index 5c6b98b2ca..da83e0ec59 100644
--- a/std/math/ceil.zig
+++ b/std/math/ceil.zig
@@ -5,7 +5,7 @@
 // - ceil(nan)   = nan
 
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/complex/index.zig b/std/math/complex.zig
similarity index 64%
rename from std/math/complex/index.zig
rename to std/math/complex.zig
index ffbf14d83e..cc0573b227 100644
--- a/std/math/complex/index.zig
+++ b/std/math/complex.zig
@@ -1,27 +1,27 @@
-const std = @import("../../index.zig");
+const std = @import("../std.zig");
 const testing = std.testing;
 const math = std.math;
 
-pub const abs = @import("abs.zig").abs;
-pub const acosh = @import("acosh.zig").acosh;
-pub const acos = @import("acos.zig").acos;
-pub const arg = @import("arg.zig").arg;
-pub const asinh = @import("asinh.zig").asinh;
-pub const asin = @import("asin.zig").asin;
-pub const atanh = @import("atanh.zig").atanh;
-pub const atan = @import("atan.zig").atan;
-pub const conj = @import("conj.zig").conj;
-pub const cosh = @import("cosh.zig").cosh;
-pub const cos = @import("cos.zig").cos;
-pub const exp = @import("exp.zig").exp;
-pub const log = @import("log.zig").log;
-pub const pow = @import("pow.zig").pow;
-pub const proj = @import("proj.zig").proj;
-pub const sinh = @import("sinh.zig").sinh;
-pub const sin = @import("sin.zig").sin;
-pub const sqrt = @import("sqrt.zig").sqrt;
-pub const tanh = @import("tanh.zig").tanh;
-pub const tan = @import("tan.zig").tan;
+pub const abs = @import("complex/abs.zig").abs;
+pub const acosh = @import("complex/acosh.zig").acosh;
+pub const acos = @import("complex/acos.zig").acos;
+pub const arg = @import("complex/arg.zig").arg;
+pub const asinh = @import("complex/asinh.zig").asinh;
+pub const asin = @import("complex/asin.zig").asin;
+pub const atanh = @import("complex/atanh.zig").atanh;
+pub const atan = @import("complex/atan.zig").atan;
+pub const conj = @import("complex/conj.zig").conj;
+pub const cosh = @import("complex/cosh.zig").cosh;
+pub const cos = @import("complex/cos.zig").cos;
+pub const exp = @import("complex/exp.zig").exp;
+pub const log = @import("complex/log.zig").log;
+pub const pow = @import("complex/pow.zig").pow;
+pub const proj = @import("complex/proj.zig").proj;
+pub const sinh = @import("complex/sinh.zig").sinh;
+pub const sin = @import("complex/sin.zig").sin;
+pub const sqrt = @import("complex/sqrt.zig").sqrt;
+pub const tanh = @import("complex/tanh.zig").tanh;
+pub const tan = @import("complex/tan.zig").tan;
 
 pub fn Complex(comptime T: type) type {
     return struct {
@@ -148,24 +148,24 @@ test "complex.magnitude" {
 }
 
 test "complex.cmath" {
-    _ = @import("abs.zig");
-    _ = @import("acosh.zig");
-    _ = @import("acos.zig");
-    _ = @import("arg.zig");
-    _ = @import("asinh.zig");
-    _ = @import("asin.zig");
-    _ = @import("atanh.zig");
-    _ = @import("atan.zig");
-    _ = @import("conj.zig");
-    _ = @import("cosh.zig");
-    _ = @import("cos.zig");
-    _ = @import("exp.zig");
-    _ = @import("log.zig");
-    _ = @import("pow.zig");
-    _ = @import("proj.zig");
-    _ = @import("sinh.zig");
-    _ = @import("sin.zig");
-    _ = @import("sqrt.zig");
-    _ = @import("tanh.zig");
-    _ = @import("tan.zig");
+    _ = @import("complex/abs.zig");
+    _ = @import("complex/acosh.zig");
+    _ = @import("complex/acos.zig");
+    _ = @import("complex/arg.zig");
+    _ = @import("complex/asinh.zig");
+    _ = @import("complex/asin.zig");
+    _ = @import("complex/atanh.zig");
+    _ = @import("complex/atan.zig");
+    _ = @import("complex/conj.zig");
+    _ = @import("complex/cosh.zig");
+    _ = @import("complex/cos.zig");
+    _ = @import("complex/exp.zig");
+    _ = @import("complex/log.zig");
+    _ = @import("complex/pow.zig");
+    _ = @import("complex/proj.zig");
+    _ = @import("complex/sinh.zig");
+    _ = @import("complex/sin.zig");
+    _ = @import("complex/sqrt.zig");
+    _ = @import("complex/tanh.zig");
+    _ = @import("complex/tan.zig");
 }
diff --git a/std/math/complex/abs.zig b/std/math/complex/abs.zig
index 245d67d4c5..e1368d6ef6 100644
--- a/std/math/complex/abs.zig
+++ b/std/math/complex/abs.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/acos.zig b/std/math/complex/acos.zig
index 1b314bc31a..8aed26a71b 100644
--- a/std/math/complex/acos.zig
+++ b/std/math/complex/acos.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/acosh.zig b/std/math/complex/acosh.zig
index 0e4c0121f4..e72bf431fe 100644
--- a/std/math/complex/acosh.zig
+++ b/std/math/complex/acosh.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/arg.zig b/std/math/complex/arg.zig
index be117a5940..0a2441d1fd 100644
--- a/std/math/complex/arg.zig
+++ b/std/math/complex/arg.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/asin.zig b/std/math/complex/asin.zig
index cf802ea206..6be775d748 100644
--- a/std/math/complex/asin.zig
+++ b/std/math/complex/asin.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/asinh.zig b/std/math/complex/asinh.zig
index 0386a636b0..8e09036750 100644
--- a/std/math/complex/asinh.zig
+++ b/std/math/complex/asinh.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/atan.zig b/std/math/complex/atan.zig
index 8e60e58e43..6b83adbd97 100644
--- a/std/math/complex/atan.zig
+++ b/std/math/complex/atan.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/atanh.zig b/std/math/complex/atanh.zig
index 5b18fe1992..8edfb6e78e 100644
--- a/std/math/complex/atanh.zig
+++ b/std/math/complex/atanh.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/conj.zig b/std/math/complex/conj.zig
index 143543f9e7..7a42d365ea 100644
--- a/std/math/complex/conj.zig
+++ b/std/math/complex/conj.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/cos.zig b/std/math/complex/cos.zig
index 658d19c3b6..71f9603c75 100644
--- a/std/math/complex/cos.zig
+++ b/std/math/complex/cos.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/cosh.zig b/std/math/complex/cosh.zig
index 5ce10b03f8..9806e41170 100644
--- a/std/math/complex/cosh.zig
+++ b/std/math/complex/cosh.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/exp.zig b/std/math/complex/exp.zig
index 9ded698d08..c74ac2fc08 100644
--- a/std/math/complex/exp.zig
+++ b/std/math/complex/exp.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/ldexp.zig b/std/math/complex/ldexp.zig
index e919ef6bec..6b4306bf77 100644
--- a/std/math/complex/ldexp.zig
+++ b/std/math/complex/ldexp.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const debug = std.debug;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/log.zig b/std/math/complex/log.zig
index 360bb7d21e..2b43a6970f 100644
--- a/std/math/complex/log.zig
+++ b/std/math/complex/log.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/pow.zig b/std/math/complex/pow.zig
index bd625626c8..9174bb3626 100644
--- a/std/math/complex/pow.zig
+++ b/std/math/complex/pow.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/proj.zig b/std/math/complex/proj.zig
index d31006129e..aadcff6ff6 100644
--- a/std/math/complex/proj.zig
+++ b/std/math/complex/proj.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/sin.zig b/std/math/complex/sin.zig
index 9d54ab0969..049631f31e 100644
--- a/std/math/complex/sin.zig
+++ b/std/math/complex/sin.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/sinh.zig b/std/math/complex/sinh.zig
index 469ea6067a..0b656e5354 100644
--- a/std/math/complex/sinh.zig
+++ b/std/math/complex/sinh.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/sqrt.zig b/std/math/complex/sqrt.zig
index 60f6061baa..e935d0b238 100644
--- a/std/math/complex/sqrt.zig
+++ b/std/math/complex/sqrt.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/tan.zig b/std/math/complex/tan.zig
index db34580598..45e2873eb6 100644
--- a/std/math/complex/tan.zig
+++ b/std/math/complex/tan.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/complex/tanh.zig b/std/math/complex/tanh.zig
index 03ab431312..de905ee3f6 100644
--- a/std/math/complex/tanh.zig
+++ b/std/math/complex/tanh.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;
diff --git a/std/math/copysign.zig b/std/math/copysign.zig
index dbf8f6e1ef..ff8140b3ab 100644
--- a/std/math/copysign.zig
+++ b/std/math/copysign.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const maxInt = std.math.maxInt;
diff --git a/std/math/cos.zig b/std/math/cos.zig
index 7783ddc09b..9479482894 100644
--- a/std/math/cos.zig
+++ b/std/math/cos.zig
@@ -4,7 +4,7 @@
 // - cos(nan)   = nan
 
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/cosh.zig b/std/math/cosh.zig
index 57c5eef828..eb3082e5fa 100644
--- a/std/math/cosh.zig
+++ b/std/math/cosh.zig
@@ -5,7 +5,7 @@
 // - cosh(nan)   = nan
 
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expo2 = @import("expo2.zig").expo2;
 const expect = std.testing.expect;
diff --git a/std/math/exp.zig b/std/math/exp.zig
index cf8fd62d80..aabccffd0b 100644
--- a/std/math/exp.zig
+++ b/std/math/exp.zig
@@ -3,7 +3,7 @@
 // - exp(+inf) = +inf
 // - exp(nan)  = nan
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const assert = std.debug.assert;
 const builtin = @import("builtin");
diff --git a/std/math/exp2.zig b/std/math/exp2.zig
index ba0001a09a..392d45bf68 100644
--- a/std/math/exp2.zig
+++ b/std/math/exp2.zig
@@ -3,7 +3,7 @@
 // - exp2(+inf) = +inf
 // - exp2(nan)  = nan
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/expm1.zig b/std/math/expm1.zig
index ba00ec2561..b83cc3e82e 100644
--- a/std/math/expm1.zig
+++ b/std/math/expm1.zig
@@ -5,7 +5,7 @@
 // - expm1(nan)  = nan
 
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/expo2.zig b/std/math/expo2.zig
index 15b80c710c..57e2bf34c9 100644
--- a/std/math/expo2.zig
+++ b/std/math/expo2.zig
@@ -1,4 +1,4 @@
-const math = @import("index.zig");
+const math = @import("../math.zig");
 
 pub fn expo2(x: var) @typeOf(x) {
     const T = @typeOf(x);
diff --git a/std/math/fabs.zig b/std/math/fabs.zig
index a605f4f33f..e30f788ae7 100644
--- a/std/math/fabs.zig
+++ b/std/math/fabs.zig
@@ -3,7 +3,7 @@
 // - fabs(+-inf) = +inf
 // - fabs(nan)   = nan
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const maxInt = std.math.maxInt;
diff --git a/std/math/floor.zig b/std/math/floor.zig
index c7c12e37ba..ab45a8fee7 100644
--- a/std/math/floor.zig
+++ b/std/math/floor.zig
@@ -6,7 +6,7 @@
 
 const builtin = @import("builtin");
 const expect = std.testing.expect;
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 
 pub fn floor(x: var) @typeOf(x) {
diff --git a/std/math/fma.zig b/std/math/fma.zig
index b084cf3cbd..a317bc96de 100644
--- a/std/math/fma.zig
+++ b/std/math/fma.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/frexp.zig b/std/math/frexp.zig
index 35f3e081a9..35eec315d9 100644
--- a/std/math/frexp.zig
+++ b/std/math/frexp.zig
@@ -4,7 +4,7 @@
 // - frexp(+-inf) = +-inf, 0
 // - frexp(nan)   = nan, undefined
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/hypot.zig b/std/math/hypot.zig
index dea11e0a61..fddbe7c068 100644
--- a/std/math/hypot.zig
+++ b/std/math/hypot.zig
@@ -5,7 +5,7 @@
 // - hypot(nan, y)    = nan
 // - hypot(x, nan)    = nan
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const maxInt = std.math.maxInt;
diff --git a/std/math/ilogb.zig b/std/math/ilogb.zig
index e7b6485357..2dfd42a62c 100644
--- a/std/math/ilogb.zig
+++ b/std/math/ilogb.zig
@@ -4,7 +4,7 @@
 // - ilogb(0)     = maxInt(i32)
 // - ilogb(nan)   = maxInt(i32)
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const maxInt = std.math.maxInt;
diff --git a/std/math/inf.zig b/std/math/inf.zig
index fb7a3489c5..e1bfbb197a 100644
--- a/std/math/inf.zig
+++ b/std/math/inf.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 
 pub fn inf(comptime T: type) T {
diff --git a/std/math/isfinite.zig b/std/math/isfinite.zig
index bf1c9ac63c..ee8a5ff590 100644
--- a/std/math/isfinite.zig
+++ b/std/math/isfinite.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const maxInt = std.math.maxInt;
diff --git a/std/math/isinf.zig b/std/math/isinf.zig
index b1e3f7795e..1b1759bd36 100644
--- a/std/math/isinf.zig
+++ b/std/math/isinf.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const maxInt = std.math.maxInt;
diff --git a/std/math/isnan.zig b/std/math/isnan.zig
index e8b03a1e34..7645528ea9 100644
--- a/std/math/isnan.zig
+++ b/std/math/isnan.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const maxInt = std.math.maxInt;
diff --git a/std/math/isnormal.zig b/std/math/isnormal.zig
index 2c57aea7a9..cddcada1d3 100644
--- a/std/math/isnormal.zig
+++ b/std/math/isnormal.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const maxInt = std.math.maxInt;
diff --git a/std/math/ln.zig b/std/math/ln.zig
index 257ce8054f..82b212f00f 100644
--- a/std/math/ln.zig
+++ b/std/math/ln.zig
@@ -5,7 +5,7 @@
 // - ln(x)     = nan if x < 0
 // - ln(nan)   = nan
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const builtin = @import("builtin");
diff --git a/std/math/log.zig b/std/math/log.zig
index 21cffcc078..100dc2fb7f 100644
--- a/std/math/log.zig
+++ b/std/math/log.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const builtin = @import("builtin");
 const TypeId = builtin.TypeId;
diff --git a/std/math/log10.zig b/std/math/log10.zig
index 8055f71280..7311778ddd 100644
--- a/std/math/log10.zig
+++ b/std/math/log10.zig
@@ -5,7 +5,7 @@
 // - log10(x)     = nan if x < 0
 // - log10(nan)   = nan
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const testing = std.testing;
 const builtin = @import("builtin");
diff --git a/std/math/log1p.zig b/std/math/log1p.zig
index 257e7b90d4..c9be1132be 100644
--- a/std/math/log1p.zig
+++ b/std/math/log1p.zig
@@ -7,7 +7,7 @@
 // - log1p(nan)   = nan
 
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/log2.zig b/std/math/log2.zig
index 1bb51bf9f9..e2dbf4105a 100644
--- a/std/math/log2.zig
+++ b/std/math/log2.zig
@@ -5,7 +5,7 @@
 // - log2(x)     = nan if x < 0
 // - log2(nan)   = nan
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const builtin = @import("builtin");
diff --git a/std/math/modf.zig b/std/math/modf.zig
index 2dadda76a9..e5a4964e63 100644
--- a/std/math/modf.zig
+++ b/std/math/modf.zig
@@ -3,7 +3,7 @@
 // - modf(+-inf) = +-inf, nan
 // - modf(nan)   = nan, nan
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const maxInt = std.math.maxInt;
diff --git a/std/math/nan.zig b/std/math/nan.zig
index d3ad43da23..1a11a141d5 100644
--- a/std/math/nan.zig
+++ b/std/math/nan.zig
@@ -1,4 +1,4 @@
-const math = @import("index.zig");
+const math = @import("../math.zig");
 
 pub fn nan(comptime T: type) T {
     return switch (T) {
diff --git a/std/math/pow.zig b/std/math/pow.zig
index f037f66d7e..81bb2d95d5 100644
--- a/std/math/pow.zig
+++ b/std/math/pow.zig
@@ -22,7 +22,7 @@
 //  pow(x, y)      = nan for finite x < 0 and finite non-integer y
 
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/powi.zig b/std/math/powi.zig
index dffb564da7..b7212efcbf 100644
--- a/std/math/powi.zig
+++ b/std/math/powi.zig
@@ -9,7 +9,7 @@
 //  powi(x, y)     = Underflow for for y > @sizeOf(x) - 1 y < 0
 
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const assert = std.debug.assert;
 const testing = std.testing;
diff --git a/std/math/round.zig b/std/math/round.zig
index 7346b703c9..39ff56ca79 100644
--- a/std/math/round.zig
+++ b/std/math/round.zig
@@ -6,7 +6,7 @@
 
 const builtin = @import("builtin");
 const expect = std.testing.expect;
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 
 pub fn round(x: var) @typeOf(x) {
diff --git a/std/math/scalbn.zig b/std/math/scalbn.zig
index d37a8659a9..d1338f5acb 100644
--- a/std/math/scalbn.zig
+++ b/std/math/scalbn.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/signbit.zig b/std/math/signbit.zig
index 728f651aec..9727152b07 100644
--- a/std/math/signbit.zig
+++ b/std/math/signbit.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/sin.zig b/std/math/sin.zig
index 5ade6636c7..e25b8a292b 100644
--- a/std/math/sin.zig
+++ b/std/math/sin.zig
@@ -5,7 +5,7 @@
 // - sin(nan)   = nan
 
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/sinh.zig b/std/math/sinh.zig
index 95924ba55a..cf4363c4a9 100644
--- a/std/math/sinh.zig
+++ b/std/math/sinh.zig
@@ -5,7 +5,7 @@
 // - sinh(nan)   = nan
 
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const expo2 = @import("expo2.zig").expo2;
diff --git a/std/math/sqrt.zig b/std/math/sqrt.zig
index 9996b44b20..9062f598a1 100644
--- a/std/math/sqrt.zig
+++ b/std/math/sqrt.zig
@@ -5,7 +5,7 @@
 // - sqrt(x)     = nan if x < 0
 // - sqrt(nan)   = nan
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const builtin = @import("builtin");
diff --git a/std/math/tan.zig b/std/math/tan.zig
index ec43092320..fc11ebdef7 100644
--- a/std/math/tan.zig
+++ b/std/math/tan.zig
@@ -5,7 +5,7 @@
 // - tan(nan)   = nan
 
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 
diff --git a/std/math/tanh.zig b/std/math/tanh.zig
index a35449a053..f88ecfdc9c 100644
--- a/std/math/tanh.zig
+++ b/std/math/tanh.zig
@@ -5,7 +5,7 @@
 // - sinh(nan)   = nan
 
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const expo2 = @import("expo2.zig").expo2;
diff --git a/std/math/trunc.zig b/std/math/trunc.zig
index 8c91ccc568..9449d0e7eb 100644
--- a/std/math/trunc.zig
+++ b/std/math/trunc.zig
@@ -4,7 +4,7 @@
 // - trunc(+-inf) = +-inf
 // - trunc(nan)   = nan
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const maxInt = std.math.maxInt;
diff --git a/std/mem.zig b/std/mem.zig
index 39b9701754..681054d087 100644
--- a/std/mem.zig
+++ b/std/mem.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const debug = std.debug;
 const assert = debug.assert;
 const math = std.math;
diff --git a/std/meta/index.zig b/std/meta.zig
similarity index 99%
rename from std/meta/index.zig
rename to std/meta.zig
index 652e2d39ec..215c5dfad8 100644
--- a/std/meta/index.zig
+++ b/std/meta.zig
@@ -1,11 +1,11 @@
-const std = @import("../index.zig");
+const std = @import("std.zig");
 const builtin = @import("builtin");
 const debug = std.debug;
 const mem = std.mem;
 const math = std.math;
 const testing = std.testing;
 
-pub const trait = @import("trait.zig");
+pub const trait = @import("meta/trait.zig");
 
 const TypeId = builtin.TypeId;
 const TypeInfo = builtin.TypeInfo;
diff --git a/std/meta/trait.zig b/std/meta/trait.zig
index 7fca5f4dcd..f77619ec39 100644
--- a/std/meta/trait.zig
+++ b/std/meta/trait.zig
@@ -1,11 +1,11 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const mem = std.mem;
 const debug = std.debug;
 const testing = std.testing;
 const warn = debug.warn;
 
-const meta = @import("index.zig");
+const meta = @import("../meta.zig");
 
 //This is necessary if we want to return generic functions directly because of how the
 // the type erasure works. see:  #1375
diff --git a/std/mutex.zig b/std/mutex.zig
index a13b1c06c7..2b3ac4e366 100644
--- a/std/mutex.zig
+++ b/std/mutex.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const builtin = @import("builtin");
 const AtomicOrder = builtin.AtomicOrder;
 const AtomicRmwOp = builtin.AtomicRmwOp;
diff --git a/std/net.zig b/std/net.zig
index 968c1f019f..bb292efd83 100644
--- a/std/net.zig
+++ b/std/net.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const builtin = @import("builtin");
 const assert = std.debug.assert;
 const net = @This();
diff --git a/std/os/index.zig b/std/os.zig
similarity index 99%
rename from std/os/index.zig
rename to std/os.zig
index e483bf2dbd..c686c2a054 100644
--- a/std/os/index.zig
+++ b/std/os.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("std.zig");
 const builtin = @import("builtin");
 const Os = builtin.Os;
 const is_windows = builtin.os == Os.windows;
@@ -13,26 +13,26 @@ comptime {
 }
 
 test "std.os" {
-    _ = @import("child_process.zig");
-    _ = @import("darwin.zig");
-    _ = @import("darwin/errno.zig");
-    _ = @import("get_user_id.zig");
-    _ = @import("linux/index.zig");
-    _ = @import("path.zig");
-    _ = @import("test.zig");
-    _ = @import("time.zig");
-    _ = @import("windows/index.zig");
-    _ = @import("uefi.zig");
-    _ = @import("get_app_data_dir.zig");
+    _ = @import("os/child_process.zig");
+    _ = @import("os/darwin.zig");
+    _ = @import("os/darwin/errno.zig");
+    _ = @import("os/get_user_id.zig");
+    _ = @import("os/linux.zig");
+    _ = @import("os/path.zig");
+    _ = @import("os/test.zig");
+    _ = @import("os/time.zig");
+    _ = @import("os/windows.zig");
+    _ = @import("os/uefi.zig");
+    _ = @import("os/get_app_data_dir.zig");
 }
 
-pub const windows = @import("windows/index.zig");
-pub const darwin = @import("darwin.zig");
-pub const linux = @import("linux/index.zig");
-pub const freebsd = @import("freebsd/index.zig");
-pub const netbsd = @import("netbsd/index.zig");
-pub const zen = @import("zen.zig");
-pub const uefi = @import("uefi.zig");
+pub const windows = @import("os/windows.zig");
+pub const darwin = @import("os/darwin.zig");
+pub const linux = @import("os/linux.zig");
+pub const freebsd = @import("os/freebsd.zig");
+pub const netbsd = @import("os/netbsd.zig");
+pub const zen = @import("os/zen.zig");
+pub const uefi = @import("os/uefi.zig");
 
 pub const posix = switch (builtin.os) {
     Os.linux => linux,
@@ -45,10 +45,10 @@ pub const posix = switch (builtin.os) {
 
 pub const net = @import("net.zig");
 
-pub const ChildProcess = @import("child_process.zig").ChildProcess;
-pub const path = @import("path.zig");
-pub const File = @import("file.zig").File;
-pub const time = @import("time.zig");
+pub const ChildProcess = @import("os/child_process.zig").ChildProcess;
+pub const path = @import("os/path.zig");
+pub const File = @import("os/file.zig").File;
+pub const time = @import("os/time.zig");
 
 pub const page_size = 4 * 1024;
 pub const MAX_PATH_BYTES = switch (builtin.os) {
@@ -61,10 +61,10 @@ pub const MAX_PATH_BYTES = switch (builtin.os) {
     else => @compileError("Unsupported OS"),
 };
 
-pub const UserInfo = @import("get_user_id.zig").UserInfo;
-pub const getUserInfo = @import("get_user_id.zig").getUserInfo;
+pub const UserInfo = @import("os/get_user_id.zig").UserInfo;
+pub const getUserInfo = @import("os/get_user_id.zig").getUserInfo;
 
-const windows_util = @import("windows/util.zig");
+const windows_util = @import("os/windows/util.zig");
 pub const windowsWaitSingle = windows_util.windowsWaitSingle;
 pub const windowsWrite = windows_util.windowsWrite;
 pub const windowsIsCygwinPty = windows_util.windowsIsCygwinPty;
@@ -88,8 +88,8 @@ pub const WindowsReadError = windows_util.ReadError;
 
 pub const FileHandle = if (is_windows) windows.HANDLE else i32;
 
-pub const getAppDataDir = @import("get_app_data_dir.zig").getAppDataDir;
-pub const GetAppDataDirError = @import("get_app_data_dir.zig").GetAppDataDirError;
+pub const getAppDataDir = @import("os/get_app_data_dir.zig").getAppDataDir;
+pub const GetAppDataDirError = @import("os/get_app_data_dir.zig").GetAppDataDirError;
 
 const debug = std.debug;
 const assert = debug.assert;
diff --git a/std/os/child_process.zig b/std/os/child_process.zig
index 1da0b3492b..653c776239 100644
--- a/std/os/child_process.zig
+++ b/std/os/child_process.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const cstr = std.cstr;
 const unicode = std.unicode;
 const io = std.io;
diff --git a/std/os/darwin.zig b/std/os/darwin.zig
index 3e883abbab..4ce631c6ab 100644
--- a/std/os/darwin.zig
+++ b/std/os/darwin.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const c = std.c;
 const assert = std.debug.assert;
 const maxInt = std.math.maxInt;
diff --git a/std/os/file.zig b/std/os/file.zig
index 23469a3c37..c9a0e2b696 100644
--- a/std/os/file.zig
+++ b/std/os/file.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const os = std.os;
 const io = std.io;
diff --git a/std/os/freebsd/index.zig b/std/os/freebsd.zig
similarity index 99%
rename from std/os/freebsd/index.zig
rename to std/os/freebsd.zig
index 48c0ea5b1e..90e8de1557 100644
--- a/std/os/freebsd/index.zig
+++ b/std/os/freebsd.zig
@@ -1,8 +1,8 @@
 const builtin = @import("builtin");
 
-pub use @import("errno.zig");
+pub use @import("freebsd/errno.zig");
 
-const std = @import("../../index.zig");
+const std = @import("../std.zig");
 const c = std.c;
 
 const assert = std.debug.assert;
@@ -119,7 +119,6 @@ pub const X_OK = 1; // test for execute or search permission
 pub const W_OK = 2; // test for write permission
 pub const R_OK = 4; // test for read permission
 
-
 pub const O_RDONLY = 0x0000;
 pub const O_WRONLY = 0x0001;
 pub const O_RDWR = 0x0002;
diff --git a/std/os/get_app_data_dir.zig b/std/os/get_app_data_dir.zig
index a49d164f46..e69c03edb9 100644
--- a/std/os/get_app_data_dir.zig
+++ b/std/os/get_app_data_dir.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const unicode = std.unicode;
 const mem = std.mem;
diff --git a/std/os/get_user_id.zig b/std/os/get_user_id.zig
index 6747cc4557..db44c6838f 100644
--- a/std/os/get_user_id.zig
+++ b/std/os/get_user_id.zig
@@ -1,6 +1,6 @@
 const builtin = @import("builtin");
 const Os = builtin.Os;
-const os = @import("index.zig");
+const os = @import("../os.zig");
 const io = @import("../io.zig");
 
 pub const UserInfo = struct {
diff --git a/std/os/linux/index.zig b/std/os/linux.zig
similarity index 99%
rename from std/os/linux/index.zig
rename to std/os/linux.zig
index 3a56461a40..e7f822185b 100644
--- a/std/os/linux/index.zig
+++ b/std/os/linux.zig
@@ -1,15 +1,15 @@
-const std = @import("../../index.zig");
+const std = @import("../std.zig");
 const assert = std.debug.assert;
 const builtin = @import("builtin");
 const maxInt = std.math.maxInt;
-const vdso = @import("vdso.zig");
+const vdso = @import("linux/vdso.zig");
 pub use switch (builtin.arch) {
-    builtin.Arch.x86_64 => @import("x86_64.zig"),
-    builtin.Arch.i386 => @import("i386.zig"),
-    builtin.Arch.aarch64 => @import("arm64.zig"),
+    builtin.Arch.x86_64 => @import("linux/x86_64.zig"),
+    builtin.Arch.i386 => @import("linux/i386.zig"),
+    builtin.Arch.aarch64 => @import("linux/arm64.zig"),
     else => @compileError("unsupported arch"),
 };
-pub use @import("errno.zig");
+pub use @import("linux/errno.zig");
 
 pub const PATH_MAX = 4096;
 
@@ -1536,6 +1536,6 @@ pub const dirent64 = extern struct {
 
 test "import" {
     if (builtin.os == builtin.Os.linux) {
-        _ = @import("test.zig");
+        _ = @import("linux/test.zig");
     }
 }
diff --git a/std/os/linux/arm64.zig b/std/os/linux/arm64.zig
index 91e4a49679..ac2c18ee5f 100644
--- a/std/os/linux/arm64.zig
+++ b/std/os/linux/arm64.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const linux = std.os.linux;
 const socklen_t = linux.socklen_t;
 const iovec = linux.iovec;
diff --git a/std/os/linux/test.zig b/std/os/linux/test.zig
index 40fb7823d2..286748b70c 100644
--- a/std/os/linux/test.zig
+++ b/std/os/linux/test.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const builtin = @import("builtin");
 const linux = std.os.linux;
 const expect = std.testing.expect;
diff --git a/std/os/linux/vdso.zig b/std/os/linux/vdso.zig
index 07745ad1eb..efd69d8542 100644
--- a/std/os/linux/vdso.zig
+++ b/std/os/linux/vdso.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const elf = std.elf;
 const linux = std.os.linux;
 const cstr = std.cstr;
diff --git a/std/os/linux/x86_64.zig b/std/os/linux/x86_64.zig
index 2ea369d9f2..d194cd4003 100644
--- a/std/os/linux/x86_64.zig
+++ b/std/os/linux/x86_64.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const linux = std.os.linux;
 const socklen_t = linux.socklen_t;
 const iovec = linux.iovec;
diff --git a/std/os/netbsd/index.zig b/std/os/netbsd.zig
similarity index 99%
rename from std/os/netbsd/index.zig
rename to std/os/netbsd.zig
index ebabc3c801..2d4b6ff124 100644
--- a/std/os/netbsd/index.zig
+++ b/std/os/netbsd.zig
@@ -1,8 +1,8 @@
 const builtin = @import("builtin");
 
-pub use @import("errno.zig");
+pub use @import("netbsd/errno.zig");
 
-const std = @import("../../index.zig");
+const std = @import("../std.zig");
 const c = std.c;
 
 const assert = std.debug.assert;
@@ -110,7 +110,6 @@ pub const X_OK = 1; // test for execute or search permission
 pub const W_OK = 2; // test for write permission
 pub const R_OK = 4; // test for read permission
 
-
 pub const O_RDONLY = 0x0000;
 pub const O_WRONLY = 0x0001;
 pub const O_RDWR = 0x0002;
diff --git a/std/os/path.zig b/std/os/path.zig
index 290f8ba17f..b68ff32408 100644
--- a/std/os/path.zig
+++ b/std/os/path.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const Os = builtin.Os;
 const debug = std.debug;
diff --git a/std/os/test.zig b/std/os/test.zig
index b2a4d96651..ab21ea1568 100644
--- a/std/os/test.zig
+++ b/std/os/test.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const os = std.os;
 const expect = std.testing.expect;
 const io = std.io;
diff --git a/std/os/time.zig b/std/os/time.zig
index bce6f265de..66ceedb1b6 100644
--- a/std/os/time.zig
+++ b/std/os/time.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const Os = builtin.Os;
 const debug = std.debug;
diff --git a/std/os/windows/index.zig b/std/os/windows.zig
similarity index 96%
rename from std/os/windows/index.zig
rename to std/os/windows.zig
index 8e9ed8b8db..96274632ce 100644
--- a/std/os/windows/index.zig
+++ b/std/os/windows.zig
@@ -1,18 +1,18 @@
-const std = @import("../../index.zig");
+const std = @import("../std.zig");
 const assert = std.debug.assert;
 const maxInt = std.math.maxInt;
 
-pub use @import("advapi32.zig");
-pub use @import("kernel32.zig");
-pub use @import("ntdll.zig");
-pub use @import("ole32.zig");
-pub use @import("shell32.zig");
+pub use @import("windows/advapi32.zig");
+pub use @import("windows/kernel32.zig");
+pub use @import("windows/ntdll.zig");
+pub use @import("windows/ole32.zig");
+pub use @import("windows/shell32.zig");
 
 test "import" {
-    _ = @import("util.zig");
+    _ = @import("windows/util.zig");
 }
 
-pub const ERROR = @import("error.zig");
+pub const ERROR = @import("windows/error.zig");
 
 pub const SHORT = c_short;
 pub const BOOL = c_int;
@@ -396,4 +396,4 @@ pub const IMAGE_TLS_DIRECTORY = extern struct {
 pub const IMAGE_TLS_DIRECTORY64 = IMAGE_TLS_DIRECTORY;
 pub const IMAGE_TLS_DIRECTORY32 = IMAGE_TLS_DIRECTORY;
 
-pub const PIMAGE_TLS_CALLBACK = ?extern fn(PVOID, DWORD, PVOID) void;
+pub const PIMAGE_TLS_CALLBACK = ?extern fn (PVOID, DWORD, PVOID) void;
diff --git a/std/os/windows/advapi32.zig b/std/os/windows/advapi32.zig
index 185c1424c6..9672767500 100644
--- a/std/os/windows/advapi32.zig
+++ b/std/os/windows/advapi32.zig
@@ -1,4 +1,4 @@
-use @import("index.zig");
+use @import("../windows.zig");
 
 pub const PROV_RSA_FULL = 1;
 
diff --git a/std/os/windows/kernel32.zig b/std/os/windows/kernel32.zig
index ce8443de02..64a97ca87d 100644
--- a/std/os/windows/kernel32.zig
+++ b/std/os/windows/kernel32.zig
@@ -1,4 +1,4 @@
-use @import("index.zig");
+use @import("../windows.zig");
 
 pub extern "kernel32" stdcallcc fn CancelIoEx(hFile: HANDLE, lpOverlapped: LPOVERLAPPED) BOOL;
 
@@ -262,12 +262,10 @@ pub const INIT_ONCE_STATIC_INIT = RTL_RUN_ONCE_INIT;
 
 pub extern "kernel32" stdcallcc fn InitOnceExecuteOnce(InitOnce: *INIT_ONCE, InitFn: INIT_ONCE_FN, Parameter: ?*c_void, Context: ?*c_void) BOOL;
 
-pub const INIT_ONCE_FN = extern fn(InitOnce: *INIT_ONCE, Parameter: ?*c_void, Context: ?*c_void) BOOL;
+pub const INIT_ONCE_FN = extern fn (InitOnce: *INIT_ONCE, Parameter: ?*c_void, Context: ?*c_void) BOOL;
 
 pub const RTL_RUN_ONCE = extern struct {
     Ptr: ?*c_void,
 };
 
-pub const RTL_RUN_ONCE_INIT = RTL_RUN_ONCE {
-    .Ptr = null,
-};
+pub const RTL_RUN_ONCE_INIT = RTL_RUN_ONCE{ .Ptr = null };
diff --git a/std/os/windows/ntdll.zig b/std/os/windows/ntdll.zig
index acb78a59f4..1b63c1e7ec 100644
--- a/std/os/windows/ntdll.zig
+++ b/std/os/windows/ntdll.zig
@@ -1,3 +1,3 @@
-use @import("index.zig");
+use @import("../windows.zig");
 
 pub extern "NtDll" stdcallcc fn RtlCaptureStackBackTrace(FramesToSkip: DWORD, FramesToCapture: DWORD, BackTrace: **c_void, BackTraceHash: ?*DWORD) WORD;
diff --git a/std/os/windows/ole32.zig b/std/os/windows/ole32.zig
index 8f34b45bbf..1ecfecba3c 100644
--- a/std/os/windows/ole32.zig
+++ b/std/os/windows/ole32.zig
@@ -1,4 +1,4 @@
-use @import("index.zig");
+use @import("../windows.zig");
 
 pub extern "ole32" stdcallcc fn CoTaskMemFree(pv: LPVOID) void;
 pub extern "ole32" stdcallcc fn CoUninitialize() void;
diff --git a/std/os/windows/shell32.zig b/std/os/windows/shell32.zig
index 139babc7a8..c299e01f17 100644
--- a/std/os/windows/shell32.zig
+++ b/std/os/windows/shell32.zig
@@ -1,4 +1,4 @@
-use @import("index.zig");
+use @import("../windows.zig");
 
 pub extern "shell32" stdcallcc fn SHGetKnownFolderPath(rfid: *const KNOWNFOLDERID, dwFlags: DWORD, hToken: ?HANDLE, ppszPath: *[*]WCHAR) HRESULT;
 
diff --git a/std/os/windows/util.zig b/std/os/windows/util.zig
index 849c15a6f5..0952343051 100644
--- a/std/os/windows/util.zig
+++ b/std/os/windows/util.zig
@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const builtin = @import("builtin");
 const os = std.os;
 const unicode = std.unicode;
diff --git a/std/os/zen.zig b/std/os/zen.zig
index 76c4df9d62..0564956b24 100644
--- a/std/os/zen.zig
+++ b/std/os/zen.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const assert = std.debug.assert;
 
 //////////////////////////
diff --git a/std/pdb.zig b/std/pdb.zig
index 663f81e0c2..2b02a84871 100644
--- a/std/pdb.zig
+++ b/std/pdb.zig
@@ -1,5 +1,5 @@
 const builtin = @import("builtin");
-const std = @import("index.zig");
+const std = @import("std.zig");
 const io = std.io;
 const math = std.math;
 const mem = std.mem;
diff --git a/std/priority_queue.zig b/std/priority_queue.zig
index 33b5a963c6..d2c493af3e 100644
--- a/std/priority_queue.zig
+++ b/std/priority_queue.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const Allocator = std.mem.Allocator;
 const debug = std.debug;
 const expect = std.testing.expect;
diff --git a/std/rand/index.zig b/std/rand.zig
similarity index 99%
rename from std/rand/index.zig
rename to std/rand.zig
index 12dd763aee..a2fdfed6fd 100644
--- a/std/rand/index.zig
+++ b/std/rand.zig
@@ -14,13 +14,13 @@
 //
 // TODO(tiehuis): Benchmark these against other reference implementations.
 
-const std = @import("../index.zig");
+const std = @import("std.zig");
 const builtin = @import("builtin");
 const assert = std.debug.assert;
 const expect = std.testing.expect;
 const mem = std.mem;
 const math = std.math;
-const ziggurat = @import("ziggurat.zig");
+const ziggurat = @import("rand/ziggurat.zig");
 const maxInt = std.math.maxInt;
 
 // When you need fast unbiased random numbers
diff --git a/std/rand/ziggurat.zig b/std/rand/ziggurat.zig
index 0636a5bfc4..995248415b 100644
--- a/std/rand/ziggurat.zig
+++ b/std/rand/ziggurat.zig
@@ -8,7 +8,7 @@
 // NOTE: This seems interesting but reference code is a bit hard to grok:
 // https://sbarral.github.io/etf.
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const Random = std.rand.Random;
 
diff --git a/std/rb.zig b/std/rb.zig
index 27e60dca6a..0b28550a13 100644
--- a/std/rb.zig
+++ b/std/rb.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const assert = std.debug.assert;
 const testing = std.testing;
 const mem = std.mem; // For mem.Compare
diff --git a/std/segmented_list.zig b/std/segmented_list.zig
index 26b7fa48f5..0600fbba3f 100644
--- a/std/segmented_list.zig
+++ b/std/segmented_list.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const assert = std.debug.assert;
 const testing = std.testing;
 const Allocator = std.mem.Allocator;
diff --git a/std/sort.zig b/std/sort.zig
index 86a6724fee..69dc148f31 100644
--- a/std/sort.zig
+++ b/std/sort.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const assert = std.debug.assert;
 const testing = std.testing;
 const mem = std.mem;
diff --git a/std/special/compiler_rt/index.zig b/std/special/compiler_rt.zig
similarity index 79%
rename from std/special/compiler_rt/index.zig
rename to std/special/compiler_rt.zig
index 7657ce6118..e8a45949e4 100644
--- a/std/special/compiler_rt/index.zig
+++ b/std/special/compiler_rt.zig
@@ -5,68 +5,68 @@ comptime {
     const linkage = if (is_test) builtin.GlobalLinkage.Internal else builtin.GlobalLinkage.Weak;
     const strong_linkage = if (is_test) builtin.GlobalLinkage.Internal else builtin.GlobalLinkage.Strong;
 
-    @export("__letf2", @import("comparetf2.zig").__letf2, linkage);
-    @export("__getf2", @import("comparetf2.zig").__getf2, linkage);
+    @export("__letf2", @import("compiler_rt/comparetf2.zig").__letf2, linkage);
+    @export("__getf2", @import("compiler_rt/comparetf2.zig").__getf2, linkage);
 
     if (!is_test) {
         // only create these aliases when not testing
-        @export("__cmptf2", @import("comparetf2.zig").__letf2, linkage);
-        @export("__eqtf2", @import("comparetf2.zig").__letf2, linkage);
-        @export("__lttf2", @import("comparetf2.zig").__letf2, linkage);
-        @export("__netf2", @import("comparetf2.zig").__letf2, linkage);
-        @export("__gttf2", @import("comparetf2.zig").__getf2, linkage);
-        @export("__gnu_h2f_ieee", @import("extendXfYf2.zig").__extendhfsf2, linkage);
-        @export("__gnu_f2h_ieee", @import("truncXfYf2.zig").__truncsfhf2, linkage);
+        @export("__cmptf2", @import("compiler_rt/comparetf2.zig").__letf2, linkage);
+        @export("__eqtf2", @import("compiler_rt/comparetf2.zig").__letf2, linkage);
+        @export("__lttf2", @import("compiler_rt/comparetf2.zig").__letf2, linkage);
+        @export("__netf2", @import("compiler_rt/comparetf2.zig").__letf2, linkage);
+        @export("__gttf2", @import("compiler_rt/comparetf2.zig").__getf2, linkage);
+        @export("__gnu_h2f_ieee", @import("compiler_rt/extendXfYf2.zig").__extendhfsf2, linkage);
+        @export("__gnu_f2h_ieee", @import("compiler_rt/truncXfYf2.zig").__truncsfhf2, linkage);
     }
 
-    @export("__unordtf2", @import("comparetf2.zig").__unordtf2, linkage);
+    @export("__unordtf2", @import("compiler_rt/comparetf2.zig").__unordtf2, linkage);
 
-    @export("__addtf3", @import("addXf3.zig").__addtf3, linkage);
-    @export("__subtf3", @import("addXf3.zig").__subtf3, linkage);
+    @export("__addtf3", @import("compiler_rt/addXf3.zig").__addtf3, linkage);
+    @export("__subtf3", @import("compiler_rt/addXf3.zig").__subtf3, linkage);
 
-    @export("__floattitf", @import("floattitf.zig").__floattitf, linkage);
-    @export("__floattidf", @import("floattidf.zig").__floattidf, linkage);
-    @export("__floattisf", @import("floattisf.zig").__floattisf, linkage);
+    @export("__floattitf", @import("compiler_rt/floattitf.zig").__floattitf, linkage);
+    @export("__floattidf", @import("compiler_rt/floattidf.zig").__floattidf, linkage);
+    @export("__floattisf", @import("compiler_rt/floattisf.zig").__floattisf, linkage);
 
-    @export("__floatunditf", @import("floatunditf.zig").__floatunditf, linkage);
-    @export("__floatunsitf", @import("floatunsitf.zig").__floatunsitf, linkage);
+    @export("__floatunditf", @import("compiler_rt/floatunditf.zig").__floatunditf, linkage);
+    @export("__floatunsitf", @import("compiler_rt/floatunsitf.zig").__floatunsitf, linkage);
 
-    @export("__floatuntitf", @import("floatuntitf.zig").__floatuntitf, linkage);
-    @export("__floatuntidf", @import("floatuntidf.zig").__floatuntidf, linkage);
-    @export("__floatuntisf", @import("floatuntisf.zig").__floatuntisf, linkage);
+    @export("__floatuntitf", @import("compiler_rt/floatuntitf.zig").__floatuntitf, linkage);
+    @export("__floatuntidf", @import("compiler_rt/floatuntidf.zig").__floatuntidf, linkage);
+    @export("__floatuntisf", @import("compiler_rt/floatuntisf.zig").__floatuntisf, linkage);
 
-    @export("__extenddftf2", @import("extendXfYf2.zig").__extenddftf2, linkage);
-    @export("__extendsftf2", @import("extendXfYf2.zig").__extendsftf2, linkage);
-    @export("__extendhfsf2", @import("extendXfYf2.zig").__extendhfsf2, linkage);
+    @export("__extenddftf2", @import("compiler_rt/extendXfYf2.zig").__extenddftf2, linkage);
+    @export("__extendsftf2", @import("compiler_rt/extendXfYf2.zig").__extendsftf2, linkage);
+    @export("__extendhfsf2", @import("compiler_rt/extendXfYf2.zig").__extendhfsf2, linkage);
 
-    @export("__truncsfhf2", @import("truncXfYf2.zig").__truncsfhf2, linkage);
-    @export("__truncdfhf2", @import("truncXfYf2.zig").__truncdfhf2, linkage);
-    @export("__trunctfdf2", @import("truncXfYf2.zig").__trunctfdf2, linkage);
-    @export("__trunctfsf2", @import("truncXfYf2.zig").__trunctfsf2, linkage);
+    @export("__truncsfhf2", @import("compiler_rt/truncXfYf2.zig").__truncsfhf2, linkage);
+    @export("__truncdfhf2", @import("compiler_rt/truncXfYf2.zig").__truncdfhf2, linkage);
+    @export("__trunctfdf2", @import("compiler_rt/truncXfYf2.zig").__trunctfdf2, linkage);
+    @export("__trunctfsf2", @import("compiler_rt/truncXfYf2.zig").__trunctfsf2, linkage);
 
-    @export("__fixunssfsi", @import("fixunssfsi.zig").__fixunssfsi, linkage);
-    @export("__fixunssfdi", @import("fixunssfdi.zig").__fixunssfdi, linkage);
-    @export("__fixunssfti", @import("fixunssfti.zig").__fixunssfti, linkage);
+    @export("__fixunssfsi", @import("compiler_rt/fixunssfsi.zig").__fixunssfsi, linkage);
+    @export("__fixunssfdi", @import("compiler_rt/fixunssfdi.zig").__fixunssfdi, linkage);
+    @export("__fixunssfti", @import("compiler_rt/fixunssfti.zig").__fixunssfti, linkage);
 
-    @export("__fixunsdfsi", @import("fixunsdfsi.zig").__fixunsdfsi, linkage);
-    @export("__fixunsdfdi", @import("fixunsdfdi.zig").__fixunsdfdi, linkage);
-    @export("__fixunsdfti", @import("fixunsdfti.zig").__fixunsdfti, linkage);
+    @export("__fixunsdfsi", @import("compiler_rt/fixunsdfsi.zig").__fixunsdfsi, linkage);
+    @export("__fixunsdfdi", @import("compiler_rt/fixunsdfdi.zig").__fixunsdfdi, linkage);
+    @export("__fixunsdfti", @import("compiler_rt/fixunsdfti.zig").__fixunsdfti, linkage);
 
-    @export("__fixunstfsi", @import("fixunstfsi.zig").__fixunstfsi, linkage);
-    @export("__fixunstfdi", @import("fixunstfdi.zig").__fixunstfdi, linkage);
-    @export("__fixunstfti", @import("fixunstfti.zig").__fixunstfti, linkage);
+    @export("__fixunstfsi", @import("compiler_rt/fixunstfsi.zig").__fixunstfsi, linkage);
+    @export("__fixunstfdi", @import("compiler_rt/fixunstfdi.zig").__fixunstfdi, linkage);
+    @export("__fixunstfti", @import("compiler_rt/fixunstfti.zig").__fixunstfti, linkage);
 
-    @export("__fixdfdi", @import("fixdfdi.zig").__fixdfdi, linkage);
-    @export("__fixdfsi", @import("fixdfsi.zig").__fixdfsi, linkage);
-    @export("__fixdfti", @import("fixdfti.zig").__fixdfti, linkage);
-    @export("__fixsfdi", @import("fixsfdi.zig").__fixsfdi, linkage);
-    @export("__fixsfsi", @import("fixsfsi.zig").__fixsfsi, linkage);
-    @export("__fixsfti", @import("fixsfti.zig").__fixsfti, linkage);
-    @export("__fixtfdi", @import("fixtfdi.zig").__fixtfdi, linkage);
-    @export("__fixtfsi", @import("fixtfsi.zig").__fixtfsi, linkage);
-    @export("__fixtfti", @import("fixtfti.zig").__fixtfti, linkage);
+    @export("__fixdfdi", @import("compiler_rt/fixdfdi.zig").__fixdfdi, linkage);
+    @export("__fixdfsi", @import("compiler_rt/fixdfsi.zig").__fixdfsi, linkage);
+    @export("__fixdfti", @import("compiler_rt/fixdfti.zig").__fixdfti, linkage);
+    @export("__fixsfdi", @import("compiler_rt/fixsfdi.zig").__fixsfdi, linkage);
+    @export("__fixsfsi", @import("compiler_rt/fixsfsi.zig").__fixsfsi, linkage);
+    @export("__fixsfti", @import("compiler_rt/fixsfti.zig").__fixsfti, linkage);
+    @export("__fixtfdi", @import("compiler_rt/fixtfdi.zig").__fixtfdi, linkage);
+    @export("__fixtfsi", @import("compiler_rt/fixtfsi.zig").__fixtfsi, linkage);
+    @export("__fixtfti", @import("compiler_rt/fixtfti.zig").__fixtfti, linkage);
 
-    @export("__udivmoddi4", @import("udivmoddi4.zig").__udivmoddi4, linkage);
+    @export("__udivmoddi4", @import("compiler_rt/udivmoddi4.zig").__udivmoddi4, linkage);
 
     @export("__udivsi3", __udivsi3, linkage);
     @export("__udivdi3", __udivdi3, linkage);
@@ -85,30 +85,30 @@ comptime {
                     @export("_chkstk", _chkstk, strong_linkage);
                     @export("__chkstk_ms", __chkstk_ms, linkage);
                 }
-                @export("_aulldiv", @import("aulldiv.zig")._aulldiv, strong_linkage);
-                @export("_aullrem", @import("aullrem.zig")._aullrem, strong_linkage);
+                @export("_aulldiv", @import("compiler_rt/aulldiv.zig")._aulldiv, strong_linkage);
+                @export("_aullrem", @import("compiler_rt/aullrem.zig")._aullrem, strong_linkage);
             },
             builtin.Arch.x86_64 => {
                 if (!builtin.link_libc) {
                     @export("__chkstk", __chkstk, strong_linkage);
                     @export("___chkstk_ms", ___chkstk_ms, linkage);
                 }
-                @export("__divti3", @import("divti3.zig").__divti3_windows_x86_64, linkage);
-                @export("__multi3", @import("multi3.zig").__multi3_windows_x86_64, linkage);
-                @export("__muloti4", @import("muloti4.zig").__muloti4_windows_x86_64, linkage);
-                @export("__udivti3", @import("udivti3.zig").__udivti3_windows_x86_64, linkage);
-                @export("__udivmodti4", @import("udivmodti4.zig").__udivmodti4_windows_x86_64, linkage);
-                @export("__umodti3", @import("umodti3.zig").__umodti3_windows_x86_64, linkage);
+                @export("__divti3", @import("compiler_rt/divti3.zig").__divti3_windows_x86_64, linkage);
+                @export("__multi3", @import("compiler_rt/multi3.zig").__multi3_windows_x86_64, linkage);
+                @export("__muloti4", @import("compiler_rt/muloti4.zig").__muloti4_windows_x86_64, linkage);
+                @export("__udivti3", @import("compiler_rt/udivti3.zig").__udivti3_windows_x86_64, linkage);
+                @export("__udivmodti4", @import("compiler_rt/udivmodti4.zig").__udivmodti4_windows_x86_64, linkage);
+                @export("__umodti3", @import("compiler_rt/umodti3.zig").__umodti3_windows_x86_64, linkage);
             },
             else => {},
         }
     } else {
-        @export("__divti3", @import("divti3.zig").__divti3, linkage);
-        @export("__multi3", @import("multi3.zig").__multi3, linkage);
-        @export("__muloti4", @import("muloti4.zig").__muloti4, linkage);
-        @export("__udivti3", @import("udivti3.zig").__udivti3, linkage);
-        @export("__udivmodti4", @import("udivmodti4.zig").__udivmodti4, linkage);
-        @export("__umodti3", @import("umodti3.zig").__umodti3, linkage);
+        @export("__divti3", @import("compiler_rt/divti3.zig").__divti3, linkage);
+        @export("__multi3", @import("compiler_rt/multi3.zig").__multi3, linkage);
+        @export("__muloti4", @import("compiler_rt/muloti4.zig").__muloti4, linkage);
+        @export("__udivti3", @import("compiler_rt/udivti3.zig").__udivti3, linkage);
+        @export("__udivmodti4", @import("compiler_rt/udivmodti4.zig").__udivmodti4, linkage);
+        @export("__umodti3", @import("compiler_rt/umodti3.zig").__umodti3, linkage);
     }
 }
 
@@ -116,7 +116,7 @@ const std = @import("std");
 const assert = std.debug.assert;
 const testing = std.testing;
 
-const __udivmoddi4 = @import("udivmoddi4.zig").__udivmoddi4;
+const __udivmoddi4 = @import("compiler_rt/udivmoddi4.zig").__udivmoddi4;
 
 // Avoid dragging in the runtime safety mechanisms into this .o file,
 // unless we're trying to test this file.
diff --git a/std/special/compiler_rt/addXf3.zig b/std/special/compiler_rt/addXf3.zig
index 09413b2328..c7e80e4e71 100644
--- a/std/special/compiler_rt/addXf3.zig
+++ b/std/special/compiler_rt/addXf3.zig
@@ -4,7 +4,7 @@
 
 const std = @import("std");
 const builtin = @import("builtin");
-const compiler_rt = @import("index.zig");
+const compiler_rt = @import("../compiler_rt.zig");
 
 pub extern fn __addtf3(a: f128, b: f128) f128 {
     return addXf3(f128, a, b);
diff --git a/std/special/compiler_rt/divti3.zig b/std/special/compiler_rt/divti3.zig
index 712cccba82..e89a1ada5c 100644
--- a/std/special/compiler_rt/divti3.zig
+++ b/std/special/compiler_rt/divti3.zig
@@ -1,6 +1,6 @@
 const udivmod = @import("udivmod.zig").udivmod;
 const builtin = @import("builtin");
-const compiler_rt = @import("index.zig");
+const compiler_rt = @import("../compiler_rt.zig");
 
 pub extern fn __divti3(a: i128, b: i128) i128 {
     @setRuntimeSafety(builtin.is_test);
diff --git a/std/special/compiler_rt/muloti4.zig b/std/special/compiler_rt/muloti4.zig
index 866077c80c..fd6855072b 100644
--- a/std/special/compiler_rt/muloti4.zig
+++ b/std/special/compiler_rt/muloti4.zig
@@ -1,6 +1,6 @@
 const udivmod = @import("udivmod.zig").udivmod;
 const builtin = @import("builtin");
-const compiler_rt = @import("index.zig");
+const compiler_rt = @import("../compiler_rt.zig");
 
 pub extern fn __muloti4(a: i128, b: i128, overflow: *c_int) i128 {
     @setRuntimeSafety(builtin.is_test);
diff --git a/std/special/compiler_rt/multi3.zig b/std/special/compiler_rt/multi3.zig
index 1152a8bda0..a0c84adaf4 100644
--- a/std/special/compiler_rt/multi3.zig
+++ b/std/special/compiler_rt/multi3.zig
@@ -1,5 +1,5 @@
 const builtin = @import("builtin");
-const compiler_rt = @import("index.zig");
+const compiler_rt = @import("../compiler_rt.zig");
 
 // Ported from git@github.com:llvm-project/llvm-project-20170507.git
 // ae684fad6d34858c014c94da69c15e7774a633c3
diff --git a/std/special/compiler_rt/udivmodti4.zig b/std/special/compiler_rt/udivmodti4.zig
index 3fa596442f..6a037d3bae 100644
--- a/std/special/compiler_rt/udivmodti4.zig
+++ b/std/special/compiler_rt/udivmodti4.zig
@@ -1,6 +1,6 @@
 const udivmod = @import("udivmod.zig").udivmod;
 const builtin = @import("builtin");
-const compiler_rt = @import("index.zig");
+const compiler_rt = @import("../compiler_rt.zig");
 
 pub extern fn __udivmodti4(a: u128, b: u128, maybe_rem: ?*u128) u128 {
     @setRuntimeSafety(builtin.is_test);
diff --git a/std/special/compiler_rt/umodti3.zig b/std/special/compiler_rt/umodti3.zig
index 9551e63a6f..12aca8b036 100644
--- a/std/special/compiler_rt/umodti3.zig
+++ b/std/special/compiler_rt/umodti3.zig
@@ -1,6 +1,6 @@
 const udivmodti4 = @import("udivmodti4.zig");
 const builtin = @import("builtin");
-const compiler_rt = @import("index.zig");
+const compiler_rt = @import("../compiler_rt.zig");
 
 pub extern fn __umodti3(a: u128, b: u128) u128 {
     @setRuntimeSafety(builtin.is_test);
diff --git a/std/spinlock.zig b/std/spinlock.zig
index 75fdf9f6e1..905460a2d0 100644
--- a/std/spinlock.zig
+++ b/std/spinlock.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const builtin = @import("builtin");
 const AtomicOrder = builtin.AtomicOrder;
 const AtomicRmwOp = builtin.AtomicRmwOp;
diff --git a/std/statically_initialized_mutex.zig b/std/statically_initialized_mutex.zig
index 16bcd7adaf..cfcaf036d3 100644
--- a/std/statically_initialized_mutex.zig
+++ b/std/statically_initialized_mutex.zig
@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const builtin = @import("builtin");
 const AtomicOrder = builtin.AtomicOrder;
 const AtomicRmwOp = builtin.AtomicRmwOp;
@@ -13,7 +13,7 @@ const windows = std.os.windows;
 /// On Windows, this mutex allocates resources when it is
 /// first used, and the resources cannot be freed.
 /// On Linux, this is an alias of std.Mutex.
-pub const StaticallyInitializedMutex = switch(builtin.os) {
+pub const StaticallyInitializedMutex = switch (builtin.os) {
     builtin.Os.linux => std.Mutex,
     builtin.Os.windows => struct {
         lock: windows.CRITICAL_SECTION,
@@ -28,7 +28,7 @@ pub const StaticallyInitializedMutex = switch(builtin.os) {
         };
 
         pub fn init() StaticallyInitializedMutex {
-            return StaticallyInitializedMutex {
+            return StaticallyInitializedMutex{
                 .lock = undefined,
                 .init_once = windows.INIT_ONCE_STATIC_INIT,
             };
@@ -54,7 +54,7 @@ pub const StaticallyInitializedMutex = switch(builtin.os) {
         pub fn acquire(self: *StaticallyInitializedMutex) Held {
             assert(windows.InitOnceExecuteOnce(&self.init_once, initCriticalSection, &self.lock, null) != 0);
             windows.EnterCriticalSection(&self.lock);
-            return Held { .mutex = self };
+            return Held{ .mutex = self };
         }
     },
     else => std.Mutex,
@@ -89,10 +89,7 @@ test "std.StaticallyInitializedMutex" {
     var fixed_buffer_allocator = std.heap.ThreadSafeFixedBufferAllocator.init(plenty_of_memory);
     var a = &fixed_buffer_allocator.allocator;
 
-
-    var context = TestContext{
-        .data = 0,
-    };
+    var context = TestContext{ .data = 0 };
 
     if (builtin.single_threaded) {
         TestContext.worker(&context);
diff --git a/std/index.zig b/std/std.zig
similarity index 76%
rename from std/index.zig
rename to std/std.zig
index f8c1b065e9..4a81fc7c35 100644
--- a/std/index.zig
+++ b/std/std.zig
@@ -14,43 +14,43 @@ pub const StaticallyInitializedMutex = @import("statically_initialized_mutex.zig
 pub const SegmentedList = @import("segmented_list.zig").SegmentedList;
 pub const SpinLock = @import("spinlock.zig").SpinLock;
 
-pub const atomic = @import("atomic/index.zig");
+pub const atomic = @import("atomic.zig");
 pub const base64 = @import("base64.zig");
 pub const build = @import("build.zig");
-pub const c = @import("c/index.zig");
+pub const c = @import("c.zig");
 pub const coff = @import("coff.zig");
-pub const crypto = @import("crypto/index.zig");
+pub const crypto = @import("crypto.zig");
 pub const cstr = @import("cstr.zig");
-pub const debug = @import("debug/index.zig");
+pub const debug = @import("debug.zig");
 pub const dwarf = @import("dwarf.zig");
 pub const elf = @import("elf.zig");
 pub const empty_import = @import("empty.zig");
 pub const event = @import("event.zig");
-pub const fmt = @import("fmt/index.zig");
-pub const hash = @import("hash/index.zig");
+pub const fmt = @import("fmt.zig");
+pub const hash = @import("hash.zig");
 pub const hash_map = @import("hash_map.zig");
 pub const heap = @import("heap.zig");
 pub const io = @import("io.zig");
 pub const json = @import("json.zig");
 pub const lazyInit = @import("lazy_init.zig").lazyInit;
 pub const macho = @import("macho.zig");
-pub const math = @import("math/index.zig");
+pub const math = @import("math.zig");
 pub const mem = @import("mem.zig");
-pub const meta = @import("meta/index.zig");
+pub const meta = @import("meta.zig");
 pub const net = @import("net.zig");
-pub const os = @import("os/index.zig");
+pub const os = @import("os.zig");
 pub const pdb = @import("pdb.zig");
-pub const rand = @import("rand/index.zig");
+pub const rand = @import("rand.zig");
 pub const rb = @import("rb.zig");
 pub const sort = @import("sort.zig");
 pub const testing = @import("testing.zig");
 pub const unicode = @import("unicode.zig");
-pub const zig = @import("zig/index.zig");
+pub const zig = @import("zig.zig");
 
 test "std" {
     // run tests from these
     _ = @import("array_list.zig");
-    _ = @import("atomic/index.zig");
+    _ = @import("atomic.zig");
     _ = @import("buf_map.zig");
     _ = @import("buf_set.zig");
     _ = @import("buffer.zig");
@@ -63,33 +63,33 @@ test "std" {
 
     _ = @import("base64.zig");
     _ = @import("build.zig");
-    _ = @import("c/index.zig");
+    _ = @import("c.zig");
     _ = @import("coff.zig");
-    _ = @import("crypto/index.zig");
+    _ = @import("crypto.zig");
     _ = @import("cstr.zig");
-    _ = @import("debug/index.zig");
+    _ = @import("debug.zig");
     _ = @import("dwarf.zig");
     _ = @import("dynamic_library.zig");
     _ = @import("elf.zig");
     _ = @import("empty.zig");
     _ = @import("event.zig");
-    _ = @import("fmt/index.zig");
-    _ = @import("hash/index.zig");
+    _ = @import("fmt.zig");
+    _ = @import("hash.zig");
     _ = @import("heap.zig");
     _ = @import("io.zig");
     _ = @import("json.zig");
     _ = @import("lazy_init.zig");
     _ = @import("macho.zig");
-    _ = @import("math/index.zig");
+    _ = @import("math.zig");
     _ = @import("mem.zig");
-    _ = @import("meta/index.zig");
+    _ = @import("meta.zig");
     _ = @import("net.zig");
-    _ = @import("os/index.zig");
+    _ = @import("os.zig");
     _ = @import("pdb.zig");
     _ = @import("priority_queue.zig");
-    _ = @import("rand/index.zig");
+    _ = @import("rand.zig");
     _ = @import("sort.zig");
     _ = @import("testing.zig");
     _ = @import("unicode.zig");
-    _ = @import("zig/index.zig");
+    _ = @import("zig.zig");
 }
diff --git a/std/testing.zig b/std/testing.zig
index 359a787960..be414181f2 100644
--- a/std/testing.zig
+++ b/std/testing.zig
@@ -1,6 +1,6 @@
 const builtin = @import("builtin");
 const TypeId = builtin.TypeId;
-const std = @import("index.zig");
+const std = @import("std.zig");
 
 /// This function is intended to be used only in tests. It prints diagnostics to stderr
 /// and then aborts when actual_error_union is not expected_error.
diff --git a/std/unicode.zig b/std/unicode.zig
index fccdf513b9..37a73d7500 100644
--- a/std/unicode.zig
+++ b/std/unicode.zig
@@ -1,4 +1,4 @@
-const std = @import("./index.zig");
+const std = @import("./std.zig");
 const builtin = @import("builtin");
 const assert = std.debug.assert;
 const testing = std.testing;
diff --git a/std/zig.zig b/std/zig.zig
new file mode 100644
index 0000000000..2d4978a4ae
--- /dev/null
+++ b/std/zig.zig
@@ -0,0 +1,16 @@
+const tokenizer = @import("zig/tokenizer.zig");
+pub const Token = tokenizer.Token;
+pub const Tokenizer = tokenizer.Tokenizer;
+pub const parse = @import("zig/parse.zig").parse;
+pub const parseStringLiteral = @import("zig/parse_string_literal.zig").parseStringLiteral;
+pub const render = @import("zig/render.zig").render;
+pub const ast = @import("zig/ast.zig");
+
+test "std.zig tests" {
+    _ = @import("zig/ast.zig");
+    _ = @import("zig/parse.zig");
+    _ = @import("zig/render.zig");
+    _ = @import("zig/tokenizer.zig");
+    _ = @import("zig/parse_string_literal.zig");
+}
+
diff --git a/std/zig/ast.zig b/std/zig/ast.zig
index d33e30801b..421c657619 100644
--- a/std/zig/ast.zig
+++ b/std/zig/ast.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const assert = std.debug.assert;
 const testing = std.testing;
 const SegmentedList = std.SegmentedList;
diff --git a/std/zig/bench.zig b/std/zig/bench.zig
index 6a9e8495bd..ed6ae9a128 100644
--- a/std/zig/bench.zig
+++ b/std/zig/bench.zig
@@ -5,7 +5,7 @@ const Tokenizer = std.zig.Tokenizer;
 const Parser = std.zig.Parser;
 const io = std.io;
 
-const source = @embedFile("../os/index.zig");
+const source = @embedFile("../os.zig");
 var fixed_buffer_mem: [10 * 1024 * 1024]u8 = undefined;
 
 pub fn main() !void {
diff --git a/std/zig/index.zig b/std/zig/index.zig
deleted file mode 100644
index da84bc5bb0..0000000000
--- a/std/zig/index.zig
+++ /dev/null
@@ -1,16 +0,0 @@
-const tokenizer = @import("tokenizer.zig");
-pub const Token = tokenizer.Token;
-pub const Tokenizer = tokenizer.Tokenizer;
-pub const parse = @import("parse.zig").parse;
-pub const parseStringLiteral = @import("parse_string_literal.zig").parseStringLiteral;
-pub const render = @import("render.zig").render;
-pub const ast = @import("ast.zig");
-
-test "std.zig tests" {
-    _ = @import("ast.zig");
-    _ = @import("parse.zig");
-    _ = @import("render.zig");
-    _ = @import("tokenizer.zig");
-    _ = @import("parse_string_literal.zig");
-}
-
diff --git a/std/zig/parse.zig b/std/zig/parse.zig
index 867dd11592..e957d1d3e1 100644
--- a/std/zig/parse.zig
+++ b/std/zig/parse.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const assert = std.debug.assert;
 const mem = std.mem;
 const ast = std.zig.ast;
diff --git a/std/zig/parse_string_literal.zig b/std/zig/parse_string_literal.zig
index 00c92a7651..acae0b64c7 100644
--- a/std/zig/parse_string_literal.zig
+++ b/std/zig/parse_string_literal.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const assert = std.debug.assert;
 
 const State = enum {
diff --git a/std/zig/render.zig b/std/zig/render.zig
index 1abc845b7c..50e928c0d8 100644
--- a/std/zig/render.zig
+++ b/std/zig/render.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const assert = std.debug.assert;
 const mem = std.mem;
diff --git a/std/zig/tokenizer.zig b/std/zig/tokenizer.zig
index 877e4e8db3..79fd1c5612 100644
--- a/std/zig/tokenizer.zig
+++ b/std/zig/tokenizer.zig
@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const mem = std.mem;
 
 pub const Token = struct {
diff --git a/test/stage1/behavior.zig b/test/stage1/behavior.zig
index c232003db7..9940a76af1 100644
--- a/test/stage1/behavior.zig
+++ b/test/stage1/behavior.zig
@@ -56,14 +56,14 @@ comptime {
     _ = @import("behavior/math.zig");
     _ = @import("behavior/merge_error_sets.zig");
     _ = @import("behavior/misc.zig");
-    _ = @import("behavior/namespace_depends_on_compile_var/index.zig");
+    _ = @import("behavior/namespace_depends_on_compile_var.zig");
     _ = @import("behavior/new_stack_call.zig");
     _ = @import("behavior/null.zig");
     _ = @import("behavior/optional.zig");
     _ = @import("behavior/pointers.zig");
     _ = @import("behavior/popcount.zig");
     _ = @import("behavior/ptrcast.zig");
-    _ = @import("behavior/pub_enum/index.zig");
+    _ = @import("behavior/pub_enum.zig");
     _ = @import("behavior/ref_var_in_if_after_if_2nd_switch_prong.zig");
     _ = @import("behavior/reflection.zig");
     _ = @import("behavior/sizeof_and_typeof.zig");
diff --git a/test/stage1/behavior/namespace_depends_on_compile_var/index.zig b/test/stage1/behavior/namespace_depends_on_compile_var.zig
similarity index 68%
rename from test/stage1/behavior/namespace_depends_on_compile_var/index.zig
rename to test/stage1/behavior/namespace_depends_on_compile_var.zig
index 32feaced10..4c4fc4eefe 100644
--- a/test/stage1/behavior/namespace_depends_on_compile_var/index.zig
+++ b/test/stage1/behavior/namespace_depends_on_compile_var.zig
@@ -9,6 +9,6 @@ test "namespace depends on compile var" {
     }
 }
 const some_namespace = switch (builtin.os) {
-    builtin.Os.linux => @import("a.zig"),
-    else => @import("b.zig"),
+    builtin.Os.linux => @import("namespace_depends_on_compile_var/a.zig"),
+    else => @import("namespace_depends_on_compile_var/b.zig"),
 };
diff --git a/test/stage1/behavior/pub_enum/index.zig b/test/stage1/behavior/pub_enum.zig
similarity index 85%
rename from test/stage1/behavior/pub_enum/index.zig
rename to test/stage1/behavior/pub_enum.zig
index 15e4114c2d..6275be7a01 100644
--- a/test/stage1/behavior/pub_enum/index.zig
+++ b/test/stage1/behavior/pub_enum.zig
@@ -1,4 +1,4 @@
-const other = @import("other.zig");
+const other = @import("pub_enum/other.zig");
 const expect = @import("std").testing.expect;
 
 test "pub enum" {