Commit e402455704

@@ -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

@@ -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(".", "", "");

@@ -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;

@@ -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);
 }

@@ -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(), ".", "");

@@ -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);

@@ -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");
-}

@@ -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;

@@ -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),

@@ -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;

@@ -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 {

@@ -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");
 

@@ -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;

@@ -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;

@@ -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");
-}

@@ -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,

@@ -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;

@@ -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 {

@@ -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");
 

@@ -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");
 

@@ -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;

@@ -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;

@@ -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;
 

@@ -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

@@ -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;

@@ -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"),

@@ -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");

@@ -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;

@@ -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;

@@ -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;

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const Lock = std.event.Lock;
 const Loop = std.event.Loop;
 

@@ -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;

@@ -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;

@@ -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;

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const RwLock = std.event.RwLock;
 const Loop = std.event.Loop;
 

@@ -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;

@@ -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;
 

@@ -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 {

@@ -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;
 

@@ -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);

@@ -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;

@@ -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 {

@@ -1,5 +0,0 @@
-pub use @import("int.zig");
-
-test "math.big" {
-    _ = @import("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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;
 

@@ -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;
 

@@ -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;
 

@@ -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;

@@ -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;
 

@@ -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;
 

@@ -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;

@@ -0,0 +1,5 @@
+pub use @import("big/int.zig");
+
+test "math.big" {
+    _ = @import("big/int.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;
 

@@ -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;
 

@@ -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");
 }

@@ -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;

@@ -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;
 

@@ -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;

@@ -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");

@@ -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;
 

@@ -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;
 

@@ -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);

@@ -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;

@@ -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) {

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 

@@ -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;
 

@@ -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;

@@ -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;

@@ -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 {

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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");

@@ -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;

@@ -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");

@@ -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;
 

@@ -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");

@@ -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;

@@ -1,4 +1,4 @@
-const math = @import("index.zig");
+const math = @import("../math.zig");
 
 pub fn nan(comptime T: type) T {
     return switch (T) {

@@ -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;
 

@@ -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;

@@ -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) {

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 

@@ -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;
 

@@ -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;

@@ -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");

@@ -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;
 

@@ -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;

@@ -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;

@@ -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

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -1,4 +1,4 @@
-use @import("index.zig");
+use @import("../windows.zig");
 
 pub const PROV_RSA_FULL = 1;
 

@@ -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 };

@@ -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;

@@ -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;

@@ -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;
 

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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 {

@@ -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");
     }
 }

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const assert = std.debug.assert;
 
 //////////////////////////

@@ -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;
 

@@ -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);

@@ -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);

@@ -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);

@@ -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

@@ -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);

@@ -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);

@@ -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.

@@ -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;

@@ -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 {

@@ -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");
-}
-

@@ -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;

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const assert = std.debug.assert;
 
 const State = enum {

@@ -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;

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const mem = std.mem;
 
 pub const Token = struct {

@@ -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);
 }

@@ -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");
+}

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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;

@@ -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
 

@@ -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;

@@ -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");
+}