diff --git a/src/cmd/aq.zig b/src/cmd/aq.zig
index d77326e..7bb7b38 100644
--- a/src/cmd/aq.zig
+++ b/src/cmd/aq.zig
@@ -5,7 +5,7 @@ const zfetch = @import("zfetch");
 const extras = @import("extras");
 const json = @import("json");
 
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 
 //
 //
diff --git a/src/cmd/aquila/install.zig b/src/cmd/aquila/install.zig
index b5b27c5..e37f3ce 100644
--- a/src/cmd/aquila/install.zig
+++ b/src/cmd/aquila/install.zig
@@ -5,7 +5,7 @@ const knownfolders = @import("known-folders");
 const extras = @import("extras");
 
 const zigmod = @import("../../lib.zig");
-const u = @import("./../../util/index.zig");
+const u = @import("./../../util/funcs.zig");
 const common = @import("./../../common.zig");
 
 pub fn execute(self_name: []const u8, args: [][]u8) !void {
diff --git a/src/cmd/aquila/update.zig b/src/cmd/aquila/update.zig
index a989eda..cc66f89 100644
--- a/src/cmd/aquila/update.zig
+++ b/src/cmd/aquila/update.zig
@@ -5,7 +5,7 @@ const knownfolders = @import("known-folders");
 const extras = @import("extras");
 
 const zigmod = @import("../../lib.zig");
-const u = @import("./../../util/index.zig");
+const u = @import("./../../util/funcs.zig");
 const common = @import("./../../common.zig");
 
 pub fn execute(self_name: []const u8, args: [][]u8) !void {
diff --git a/src/cmd/ci.zig b/src/cmd/ci.zig
index 49979be..75d070a 100644
--- a/src/cmd/ci.zig
+++ b/src/cmd/ci.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const string = []const u8;
 
 const zigmod = @import("../lib.zig");
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 const common = @import("./../common.zig");
 
 // Inspired by:
diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig
index 7bdc9e0..6289ba0 100644
--- a/src/cmd/fetch.zig
+++ b/src/cmd/fetch.zig
@@ -4,7 +4,7 @@ const ansi = @import("ansi");
 const extras = @import("extras");
 
 const zigmod = @import("../lib.zig");
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 const common = @import("./../common.zig");
 const license = @import("./license.zig");
 
diff --git a/src/cmd/generate.zig b/src/cmd/generate.zig
index 5cc18b3..7a495e3 100644
--- a/src/cmd/generate.zig
+++ b/src/cmd/generate.zig
@@ -3,7 +3,7 @@ const string = []const u8;
 const extras = @import("extras");
 
 const zigmod = @import("../lib.zig");
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 const common = @import("./../common.zig");
 
 //
diff --git a/src/cmd/init.zig b/src/cmd/init.zig
index 9b262bb..c6559c5 100644
--- a/src/cmd/init.zig
+++ b/src/cmd/init.zig
@@ -8,7 +8,7 @@ const ini = @import("ini");
 const time = @import("time");
 const extras = @import("extras");
 
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 
 //
 //
diff --git a/src/cmd/license.zig b/src/cmd/license.zig
index 9ba4d58..5361afe 100644
--- a/src/cmd/license.zig
+++ b/src/cmd/license.zig
@@ -6,7 +6,7 @@ const licenses = @import("licenses");
 const extras = @import("extras");
 
 const zigmod = @import("../lib.zig");
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 const common = @import("./../common.zig");
 
 const List = std.ArrayList(zigmod.Module);
diff --git a/src/cmd/sum.zig b/src/cmd/sum.zig
index da91051..301c7ce 100644
--- a/src/cmd/sum.zig
+++ b/src/cmd/sum.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const gpa = std.heap.c_allocator;
 
 const zigmod = @import("../lib.zig");
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 const common = @import("./../common.zig");
 
 //
diff --git a/src/cmd/version.zig b/src/cmd/version.zig
index 4fb8d88..a262f21 100644
--- a/src/cmd/version.zig
+++ b/src/cmd/version.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const gpa = std.heap.c_allocator;
 const builtin = @import("builtin");
 
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 
 //
 //
diff --git a/src/cmd/zpm.zig b/src/cmd/zpm.zig
index bdbabf9..071be0b 100644
--- a/src/cmd/zpm.zig
+++ b/src/cmd/zpm.zig
@@ -5,7 +5,7 @@ const zfetch = @import("zfetch");
 const extras = @import("extras");
 const json = @import("json");
 
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 
 //
 //
diff --git a/src/cmd/zpm/add.zig b/src/cmd/zpm/add.zig
index b787517..4bee8c5 100644
--- a/src/cmd/zpm/add.zig
+++ b/src/cmd/zpm/add.zig
@@ -4,7 +4,7 @@ const zfetch = @import("zfetch");
 const extras = @import("extras");
 
 const zigmod = @import("../../lib.zig");
-const u = @import("./../../util/index.zig");
+const u = @import("./../../util/funcs.zig");
 const zpm = @import("./../zpm.zig");
 
 //
diff --git a/src/common.zig b/src/common.zig
index 5d83eb0..613f50c 100644
--- a/src/common.zig
+++ b/src/common.zig
@@ -5,7 +5,7 @@ const ansi = @import("ansi");
 const extras = @import("extras");
 
 const zigmod = @import("./lib.zig");
-const u = @import("./util/index.zig");
+const u = @import("./util/funcs.zig");
 
 //
 //
diff --git a/src/util/dep.zig b/src/util/dep.zig
index bc5ce4a..58412a7 100644
--- a/src/util/dep.zig
+++ b/src/util/dep.zig
@@ -5,7 +5,7 @@ const yaml = @import("yaml");
 const extras = @import("extras");
 
 const zigmod = @import("../lib.zig");
-const u = @import("index.zig");
+const u = @import("funcs.zig");
 
 //
 //
diff --git a/src/util/dep_type.zig b/src/util/dep_type.zig
index 865b826..1e82204 100644
--- a/src/util/dep_type.zig
+++ b/src/util/dep_type.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
 const string = []const u8;
 
-const u = @import("./index.zig");
+const u = @import("./funcs.zig");
 
 //
 //
diff --git a/src/util/funcs.zig b/src/util/funcs.zig
index a483131..7ca645c 100644
--- a/src/util/funcs.zig
+++ b/src/util/funcs.zig
@@ -4,8 +4,6 @@ const gpa = std.heap.c_allocator;
 const extras = @import("extras");
 const git = @import("git");
 
-const u = @import("index.zig");
-
 //
 //
 
@@ -56,7 +54,7 @@ pub fn file_list(alloc: std.mem.Allocator, dpath: string) ![]const string {
 pub fn run_cmd_raw(alloc: std.mem.Allocator, dir: ?string, args: []const string) !std.process.Child.RunResult {
     return std.process.Child.run(.{ .allocator = alloc, .cwd = dir, .argv = args, .max_output_bytes = std.math.maxInt(usize) }) catch |e| switch (e) {
         error.FileNotFound => {
-            u.fail("\"{s}\" command not found", .{args[0]});
+            fail("\"{s}\" command not found", .{args[0]});
         },
         else => |ee| return ee,
     };
diff --git a/src/util/index.zig b/src/util/index.zig
deleted file mode 100644
index 8766d27..0000000
--- a/src/util/index.zig
+++ /dev/null
@@ -1 +0,0 @@
-pub usingnamespace @import("./funcs.zig");
diff --git a/src/util/modfile.zig b/src/util/modfile.zig
index e381fbb..923686f 100644
--- a/src/util/modfile.zig
+++ b/src/util/modfile.zig
@@ -3,7 +3,7 @@ const string = []const u8;
 const yaml = @import("yaml");
 
 const zigmod = @import("../lib.zig");
-const u = @import("index.zig");
+const u = @import("funcs.zig");
 
 //
 //
diff --git a/src/util/module.zig b/src/util/module.zig
index 61a7872..dcc4084 100644
--- a/src/util/module.zig
+++ b/src/util/module.zig
@@ -5,7 +5,7 @@ const yaml = @import("yaml");
 const extras = @import("extras");
 
 const zigmod = @import("../lib.zig");
-const u = @import("index.zig");
+const u = @import("funcs.zig");
 const common = @import("./../common.zig");
 
 //