import everything from "bun" where possible

42 files changed, 288 insertions, 288 deletions

diff --git a/src/bun.js/api/bun.zig b/src/bun.js/api/bun.zig
index f993bc86e..087d35250 100644
--- a/src/bun.js/api/bun.zig
+++ b/src/bun.js/api/bun.zig
@@ -1,13 +1,13 @@
 const Bun = @This();
-const default_allocator = @import("../../global.zig").default_allocator;
-const bun = @import("../../global.zig");
+const default_allocator = @import("bun").default_allocator;
+const bun = @import("bun");
 const Environment = bun.Environment;
-const NetworkThread = @import("http").NetworkThread;
+const NetworkThread = @import("bun").HTTP.NetworkThread;
 const Global = bun.Global;
 const strings = bun.strings;
 const string = bun.string;
-const Output = @import("../../global.zig").Output;
-const MutableString = @import("../../global.zig").MutableString;
+const Output = @import("bun").Output;
+const MutableString = @import("bun").MutableString;
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 const IdentityContext = @import("../../identity_context.zig").IdentityContext;
@@ -16,7 +16,7 @@ const Resolver = @import("../../resolver/resolver.zig");
 const ast = @import("../../import_record.zig");
 const NodeModuleBundle = @import("../../node_module_bundle.zig").NodeModuleBundle;
 const MacroEntryPoint = @import("../../bundler.zig").MacroEntryPoint;
-const logger = @import("../../logger.zig");
+const logger = @import("bun").logger;
 const Api = @import("../../api/schema.zig").Api;
 const options = @import("../../options.zig");
 const Bundler = @import("../../bundler.zig").Bundler;
@@ -29,7 +29,7 @@ const http = @import("../../http.zig");
 const NodeFallbackModules = @import("../../node_fallbacks.zig");
 const ImportKind = ast.ImportKind;
 const Analytics = @import("../../analytics/analytics_thread.zig");
-const ZigString = @import("../../jsc.zig").ZigString;
+const ZigString = @import("bun").JSC.ZigString;
 const Runtime = @import("../../runtime.zig");
 const Router = @import("./filesystem_router.zig");
 const ImportRecord = ast.ImportRecord;
@@ -37,39 +37,39 @@ const DotEnv = @import("../../env_loader.zig");
 const ParseResult = @import("../../bundler.zig").ParseResult;
 const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON;
 const MacroRemap = @import("../../resolver/package_json.zig").MacroMap;
-const WebCore = @import("../../jsc.zig").WebCore;
+const WebCore = @import("bun").JSC.WebCore;
 const Request = WebCore.Request;
 const Response = WebCore.Response;
 const Headers = WebCore.Headers;
 const Fetch = WebCore.Fetch;
 const FetchEvent = WebCore.FetchEvent;
-const js = @import("../../jsc.zig").C;
-const JSC = @import("../../jsc.zig");
+const js = @import("bun").JSC.C;
+const JSC = @import("bun").JSC;
 const JSError = @import("../base.zig").JSError;
 const d = @import("../base.zig").d;
 const MarkedArrayBuffer = @import("../base.zig").MarkedArrayBuffer;
 const getAllocator = @import("../base.zig").getAllocator;
-const JSValue = @import("../../jsc.zig").JSValue;
+const JSValue = @import("bun").JSC.JSValue;
 const NewClass = @import("../base.zig").NewClass;
-const Microtask = @import("../../jsc.zig").Microtask;
-const JSGlobalObject = @import("../../jsc.zig").JSGlobalObject;
-const ExceptionValueRef = @import("../../jsc.zig").ExceptionValueRef;
-const JSPrivateDataPtr = @import("../../jsc.zig").JSPrivateDataPtr;
-const ZigConsoleClient = @import("../../jsc.zig").ZigConsoleClient;
-const Node = @import("../../jsc.zig").Node;
-const ZigException = @import("../../jsc.zig").ZigException;
-const ZigStackTrace = @import("../../jsc.zig").ZigStackTrace;
-const ErrorableResolvedSource = @import("../../jsc.zig").ErrorableResolvedSource;
-const ResolvedSource = @import("../../jsc.zig").ResolvedSource;
-const JSPromise = @import("../../jsc.zig").JSPromise;
-const JSInternalPromise = @import("../../jsc.zig").JSInternalPromise;
-const JSModuleLoader = @import("../../jsc.zig").JSModuleLoader;
-const JSPromiseRejectionOperation = @import("../../jsc.zig").JSPromiseRejectionOperation;
-const Exception = @import("../../jsc.zig").Exception;
-const ErrorableZigString = @import("../../jsc.zig").ErrorableZigString;
-const ZigGlobalObject = @import("../../jsc.zig").ZigGlobalObject;
-const VM = @import("../../jsc.zig").VM;
-const JSFunction = @import("../../jsc.zig").JSFunction;
+const Microtask = @import("bun").JSC.Microtask;
+const JSGlobalObject = @import("bun").JSC.JSGlobalObject;
+const ExceptionValueRef = @import("bun").JSC.ExceptionValueRef;
+const JSPrivateDataPtr = @import("bun").JSC.JSPrivateDataPtr;
+const ZigConsoleClient = @import("bun").JSC.ZigConsoleClient;
+const Node = @import("bun").JSC.Node;
+const ZigException = @import("bun").JSC.ZigException;
+const ZigStackTrace = @import("bun").JSC.ZigStackTrace;
+const ErrorableResolvedSource = @import("bun").JSC.ErrorableResolvedSource;
+const ResolvedSource = @import("bun").JSC.ResolvedSource;
+const JSPromise = @import("bun").JSC.JSPromise;
+const JSInternalPromise = @import("bun").JSC.JSInternalPromise;
+const JSModuleLoader = @import("bun").JSC.JSModuleLoader;
+const JSPromiseRejectionOperation = @import("bun").JSC.JSPromiseRejectionOperation;
+const Exception = @import("bun").JSC.Exception;
+const ErrorableZigString = @import("bun").JSC.ErrorableZigString;
+const ZigGlobalObject = @import("bun").JSC.ZigGlobalObject;
+const VM = @import("bun").JSC.VM;
+const JSFunction = @import("bun").JSC.JSFunction;
 const Config = @import("../config.zig");
 const URL = @import("../../url.zig").URL;
 const Transpiler = @import("./transpiler.zig");
@@ -2270,7 +2270,7 @@ pub const Timer = struct {
         return VirtualMachine.vm.timer.last_id;
     }
 
-    const uws = @import("uws");
+    const uws = @import("bun").uws;
 
     // TODO: reference count to avoid multiple Strong references to the same
     // object in setInterval
diff --git a/src/bun.js/api/bun/socket.zig b/src/bun.js/api/bun/socket.zig
index 2405996cf..78829f428 100644
--- a/src/bun.js/api/bun/socket.zig
+++ b/src/bun.js/api/bun/socket.zig
@@ -1,19 +1,19 @@
-const default_allocator = @import("../../../global.zig").default_allocator;
-const bun = @import("../../../global.zig");
+const default_allocator = @import("bun").default_allocator;
+const bun = @import("bun");
 const Environment = bun.Environment;
-const NetworkThread = @import("http").NetworkThread;
+const NetworkThread = @import("bun").HTTP.NetworkThread;
 const Global = bun.Global;
 const strings = bun.strings;
 const string = bun.string;
-const Output = @import("../../../global.zig").Output;
-const MutableString = @import("../../../global.zig").MutableString;
+const Output = @import("bun").Output;
+const MutableString = @import("bun").MutableString;
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const JSC = @import("javascript_core");
+const JSC = @import("bun").JSC;
 const JSValue = JSC.JSValue;
 const JSGlobalObject = JSC.JSGlobalObject;
 const Which = @import("../../../which.zig");
-const uws = @import("uws");
+const uws = @import("bun").uws;
 const ZigString = JSC.ZigString;
 // const Corker = struct {
 //     ptr: ?*[16384]u8 = null,
diff --git a/src/bun.js/api/bun/spawn.zig b/src/bun.js/api/bun/spawn.zig
index afcc5509b..7ed36cf34 100644
--- a/src/bun.js/api/bun/spawn.zig
+++ b/src/bun.js/api/bun/spawn.zig
@@ -1,5 +1,5 @@
-const JSC = @import("javascript_core");
-const bun = @import("../../../global.zig");
+const JSC = @import("bun").JSC;
+const bun = @import("bun");
 const string = bun.string;
 const std = @import("std");
 
diff --git a/src/bun.js/api/bun/subprocess.zig b/src/bun.js/api/bun/subprocess.zig
index d4fc06e2d..0f70a763c 100644
--- a/src/bun.js/api/bun/subprocess.zig
+++ b/src/bun.js/api/bun/subprocess.zig
@@ -1,16 +1,16 @@
 const Bun = @This();
-const default_allocator = @import("../../../global.zig").default_allocator;
-const bun = @import("../../../global.zig");
+const default_allocator = @import("bun").default_allocator;
+const bun = @import("bun");
 const Environment = bun.Environment;
-const NetworkThread = @import("http").NetworkThread;
+const NetworkThread = @import("bun").HTTP.NetworkThread;
 const Global = bun.Global;
 const strings = bun.strings;
 const string = bun.string;
-const Output = @import("../../../global.zig").Output;
-const MutableString = @import("../../../global.zig").MutableString;
+const Output = @import("bun").Output;
+const MutableString = @import("bun").MutableString;
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const JSC = @import("javascript_core");
+const JSC = @import("bun").JSC;
 const JSValue = JSC.JSValue;
 const JSGlobalObject = JSC.JSGlobalObject;
 const Which = @import("../../../which.zig");
diff --git a/src/bun.js/api/ffi.zig b/src/bun.js/api/ffi.zig
index a1d0640b2..042ac37fa 100644
--- a/src/bun.js/api/ffi.zig
+++ b/src/bun.js/api/ffi.zig
@@ -1,13 +1,13 @@
 const Bun = @This();
-const default_allocator = @import("../../global.zig").default_allocator;
-const bun = @import("../../global.zig");
+const default_allocator = @import("bun").default_allocator;
+const bun = @import("bun");
 const Environment = bun.Environment;
-const NetworkThread = @import("http").NetworkThread;
+const NetworkThread = @import("bun").HTTP.NetworkThread;
 const Global = bun.Global;
 const strings = bun.strings;
 const string = bun.string;
-const Output = @import("../../global.zig").Output;
-const MutableString = @import("../../global.zig").MutableString;
+const Output = @import("bun").Output;
+const MutableString = @import("bun").MutableString;
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 const IdentityContext = @import("../../identity_context.zig").IdentityContext;
@@ -16,7 +16,7 @@ const Resolver = @import("../../resolver/resolver.zig");
 const ast = @import("../../import_record.zig");
 const NodeModuleBundle = @import("../../node_module_bundle.zig").NodeModuleBundle;
 const MacroEntryPoint = @import("../../bundler.zig").MacroEntryPoint;
-const logger = @import("../../logger.zig");
+const logger = @import("bun").logger;
 const Api = @import("../../api/schema.zig").Api;
 const options = @import("../../options.zig");
 const Bundler = @import("../../bundler.zig").Bundler;
@@ -29,46 +29,46 @@ const http = @import("../../http.zig");
 const NodeFallbackModules = @import("../../node_fallbacks.zig");
 const ImportKind = ast.ImportKind;
 const Analytics = @import("../../analytics/analytics_thread.zig");
-const ZigString = @import("../../jsc.zig").ZigString;
+const ZigString = @import("bun").JSC.ZigString;
 const Runtime = @import("../../runtime.zig");
 const ImportRecord = ast.ImportRecord;
 const DotEnv = @import("../../env_loader.zig");
 const ParseResult = @import("../../bundler.zig").ParseResult;
 const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON;
 const MacroRemap = @import("../../resolver/package_json.zig").MacroMap;
-const WebCore = @import("../../jsc.zig").WebCore;
+const WebCore = @import("bun").JSC.WebCore;
 const Request = WebCore.Request;
 const Response = WebCore.Response;
 const Headers = WebCore.Headers;
 const Fetch = WebCore.Fetch;
 const FetchEvent = WebCore.FetchEvent;
-const js = @import("../../jsc.zig").C;
-const JSC = @import("../../jsc.zig");
+const js = @import("bun").JSC.C;
+const JSC = @import("bun").JSC;
 const JSError = @import("../base.zig").JSError;
 const d = @import("../base.zig").d;
 const MarkedArrayBuffer = @import("../base.zig").MarkedArrayBuffer;
 const getAllocator = @import("../base.zig").getAllocator;
-const JSValue = @import("../../jsc.zig").JSValue;
+const JSValue = @import("bun").JSC.JSValue;
 const NewClass = @import("../base.zig").NewClass;
-const Microtask = @import("../../jsc.zig").Microtask;
-const JSGlobalObject = @import("../../jsc.zig").JSGlobalObject;
-const ExceptionValueRef = @import("../../jsc.zig").ExceptionValueRef;
-const JSPrivateDataPtr = @import("../../jsc.zig").JSPrivateDataPtr;
-const ZigConsoleClient = @import("../../jsc.zig").ZigConsoleClient;
-const Node = @import("../../jsc.zig").Node;
-const ZigException = @import("../../jsc.zig").ZigException;
-const ZigStackTrace = @import("../../jsc.zig").ZigStackTrace;
-const ErrorableResolvedSource = @import("../../jsc.zig").ErrorableResolvedSource;
-const ResolvedSource = @import("../../jsc.zig").ResolvedSource;
-const JSPromise = @import("../../jsc.zig").JSPromise;
-const JSInternalPromise = @import("../../jsc.zig").JSInternalPromise;
-const JSModuleLoader = @import("../../jsc.zig").JSModuleLoader;
-const JSPromiseRejectionOperation = @import("../../jsc.zig").JSPromiseRejectionOperation;
-const Exception = @import("../../jsc.zig").Exception;
-const ErrorableZigString = @import("../../jsc.zig").ErrorableZigString;
-const ZigGlobalObject = @import("../../jsc.zig").ZigGlobalObject;
-const VM = @import("../../jsc.zig").VM;
-const JSFunction = @import("../../jsc.zig").JSFunction;
+const Microtask = @import("bun").JSC.Microtask;
+const JSGlobalObject = @import("bun").JSC.JSGlobalObject;
+const ExceptionValueRef = @import("bun").JSC.ExceptionValueRef;
+const JSPrivateDataPtr = @import("bun").JSC.JSPrivateDataPtr;
+const ZigConsoleClient = @import("bun").JSC.ZigConsoleClient;
+const Node = @import("bun").JSC.Node;
+const ZigException = @import("bun").JSC.ZigException;
+const ZigStackTrace = @import("bun").JSC.ZigStackTrace;
+const ErrorableResolvedSource = @import("bun").JSC.ErrorableResolvedSource;
+const ResolvedSource = @import("bun").JSC.ResolvedSource;
+const JSPromise = @import("bun").JSC.JSPromise;
+const JSInternalPromise = @import("bun").JSC.JSInternalPromise;
+const JSModuleLoader = @import("bun").JSC.JSModuleLoader;
+const JSPromiseRejectionOperation = @import("bun").JSC.JSPromiseRejectionOperation;
+const Exception = @import("bun").JSC.Exception;
+const ErrorableZigString = @import("bun").JSC.ErrorableZigString;
+const ZigGlobalObject = @import("bun").JSC.ZigGlobalObject;
+const VM = @import("bun").JSC.VM;
+const JSFunction = @import("bun").JSC.JSFunction;
 const Config = @import("../config.zig");
 const URL = @import("../../url.zig").URL;
 const Transpiler = @import("./transpiler.zig");
diff --git a/src/bun.js/api/filesystem_router.zig b/src/bun.js/api/filesystem_router.zig
index 859831234..d1cec699e 100644
--- a/src/bun.js/api/filesystem_router.zig
+++ b/src/bun.js/api/filesystem_router.zig
@@ -4,9 +4,9 @@ const http = @import("../../http.zig");
 const JavaScript = @import("../javascript.zig");
 const QueryStringMap = @import("../../url.zig").QueryStringMap;
 const CombinedScanner = @import("../../url.zig").CombinedScanner;
-const bun = @import("../../global.zig");
+const bun = @import("bun");
 const string = bun.string;
-const JSC = @import("../../jsc.zig");
+const JSC = @import("bun").JSC;
 const js = JSC.C;
 const WebCore = @import("../webcore/response.zig");
 const Bundler = @import("../../bundler.zig");
@@ -20,7 +20,7 @@ const JSObject = JSC.JSObject;
 const JSError = Base.JSError;
 const JSValue = JSC.JSValue;
 const JSGlobalObject = JSC.JSGlobalObject;
-const strings = @import("strings");
+const strings = @import("bun").strings;
 const NewClass = Base.NewClass;
 const To = Base.To;
 const Request = WebCore.Request;
@@ -28,7 +28,7 @@ const d = Base.d;
 const FetchEvent = WebCore.FetchEvent;
 const URLPath = @import("../../http/url_path.zig");
 const URL = @import("../../url.zig").URL;
-const Log = @import("../../logger.zig");
+const Log = @import("bun").logger;
 const Resolver = @import("../../resolver/resolver.zig").Resolver;
 const Router = @import("../../router.zig");
 
diff --git a/src/bun.js/api/html_rewriter.zig b/src/bun.js/api/html_rewriter.zig
index e99e49f07..a5e6a5708 100644
--- a/src/bun.js/api/html_rewriter.zig
+++ b/src/bun.js/api/html_rewriter.zig
@@ -4,9 +4,9 @@ const http = @import("../../http.zig");
 const JavaScript = @import("../javascript.zig");
 const QueryStringMap = @import("../../url.zig").QueryStringMap;
 const CombinedScanner = @import("../../url.zig").CombinedScanner;
-const bun = @import("../../global.zig");
+const bun = @import("bun");
 const string = bun.string;
-const JSC = @import("../../jsc.zig");
+const JSC = @import("bun").JSC;
 const js = JSC.C;
 const WebCore = @import("../webcore/response.zig");
 const Router = @This();
@@ -21,14 +21,14 @@ const JSObject = JSC.JSObject;
 const JSError = Base.JSError;
 const JSValue = JSC.JSValue;
 const JSGlobalObject = JSC.JSGlobalObject;
-const strings = @import("strings");
+const strings = @import("bun").strings;
 const NewClass = Base.NewClass;
 const To = Base.To;
 const Request = WebCore.Request;
 const d = Base.d;
 const FetchEvent = WebCore.FetchEvent;
 const Response = WebCore.Response;
-const LOLHTML = @import("lolhtml");
+const LOLHTML = @import("bun").LOLHTML;
 
 const SelectorMap = std.ArrayListUnmanaged(*LOLHTML.HTMLSelector);
 pub const LOLHTMLContext = struct {
diff --git a/src/bun.js/api/server.zig b/src/bun.js/api/server.zig
index ebe27f6e1..fb991481f 100644
--- a/src/bun.js/api/server.zig
+++ b/src/bun.js/api/server.zig
@@ -1,13 +1,13 @@
 const Bun = @This();
-const default_allocator = @import("../../global.zig").default_allocator;
-const bun = @import("../../global.zig");
+const default_allocator = @import("bun").default_allocator;
+const bun = @import("bun");
 const Environment = bun.Environment;
-const NetworkThread = @import("http").NetworkThread;
+const NetworkThread = @import("bun").HTTP.NetworkThread;
 const Global = bun.Global;
 const strings = bun.strings;
 const string = bun.string;
-const Output = @import("../../global.zig").Output;
-const MutableString = @import("../../global.zig").MutableString;
+const Output = @import("bun").Output;
+const MutableString = @import("bun").MutableString;
 const std = @import("std");
 const Allocator = std.mem.Allocator;
 const IdentityContext = @import("../../identity_context.zig").IdentityContext;
@@ -16,7 +16,7 @@ const Resolver = @import("../../resolver/resolver.zig");
 const ast = @import("../../import_record.zig");
 const NodeModuleBundle = @import("../../node_module_bundle.zig").NodeModuleBundle;
 const MacroEntryPoint = @import("../../bundler.zig").MacroEntryPoint;
-const logger = @import("../../logger.zig");
+const logger = @import("bun").logger;
 const Api = @import("../../api/schema.zig").Api;
 const options = @import("../../options.zig");
 const Bundler = @import("../../bundler.zig").Bundler;
@@ -29,57 +29,57 @@ const http = @import("../../http.zig");
 const NodeFallbackModules = @import("../../node_fallbacks.zig");
 const ImportKind = ast.ImportKind;
 const Analytics = @import("../../analytics/analytics_thread.zig");
-const ZigString = @import("javascript_core").ZigString;
+const ZigString = @import("bun").JSC.ZigString;
 const Runtime = @import("../../runtime.zig");
 const ImportRecord = ast.ImportRecord;
 const DotEnv = @import("../../env_loader.zig");
 const ParseResult = @import("../../bundler.zig").ParseResult;
 const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON;
 const MacroRemap = @import("../../resolver/package_json.zig").MacroMap;
-const WebCore = @import("javascript_core").WebCore;
+const WebCore = @import("bun").JSC.WebCore;
 const Request = WebCore.Request;
 const Response = WebCore.Response;
 const Headers = WebCore.Headers;
 const Fetch = WebCore.Fetch;
-const HTTP = @import("http");
+const HTTP = @import("bun").HTTP;
 const FetchEvent = WebCore.FetchEvent;
-const js = @import("javascript_core").C;
-const JSC = @import("javascript_core");
+const js = @import("bun").JSC.C;
+const JSC = @import("bun").JSC;
 const JSError = @import("../base.zig").JSError;
 const MarkedArrayBuffer = @import("../base.zig").MarkedArrayBuffer;
 const getAllocator = @import("../base.zig").getAllocator;
-const JSValue = @import("javascript_core").JSValue;
+const JSValue = @import("bun").JSC.JSValue;
 const NewClass = @import("../base.zig").NewClass;
-const Microtask = @import("javascript_core").Microtask;
-const JSGlobalObject = @import("javascript_core").JSGlobalObject;
-const ExceptionValueRef = @import("javascript_core").ExceptionValueRef;
-const JSPrivateDataPtr = @import("javascript_core").JSPrivateDataPtr;
-const ZigConsoleClient = @import("javascript_core").ZigConsoleClient;
-const Node = @import("javascript_core").Node;
-const ZigException = @import("javascript_core").ZigException;
-const ZigStackTrace = @import("javascript_core").ZigStackTrace;
-const ErrorableResolvedSource = @import("javascript_core").ErrorableResolvedSource;
-const ResolvedSource = @import("javascript_core").ResolvedSource;
-const JSPromise = @import("javascript_core").JSPromise;
-const JSInternalPromise = @import("javascript_core").JSInternalPromise;
-const JSModuleLoader = @import("javascript_core").JSModuleLoader;
-const JSPromiseRejectionOperation = @import("javascript_core").JSPromiseRejectionOperation;
-const Exception = @import("javascript_core").Exception;
-const ErrorableZigString = @import("javascript_core").ErrorableZigString;
-const ZigGlobalObject = @import("javascript_core").ZigGlobalObject;
-const VM = @import("javascript_core").VM;
-const JSFunction = @import("javascript_core").JSFunction;
+const Microtask = @import("bun").JSC.Microtask;
+const JSGlobalObject = @import("bun").JSC.JSGlobalObject;
+const ExceptionValueRef = @import("bun").JSC.ExceptionValueRef;
+const JSPrivateDataPtr = @import("bun").JSC.JSPrivateDataPtr;
+const ZigConsoleClient = @import("bun").JSC.ZigConsoleClient;
+const Node = @import("bun").JSC.Node;
+const ZigException = @import("bun").JSC.ZigException;
+const ZigStackTrace = @import("bun").JSC.ZigStackTrace;
+const ErrorableResolvedSource = @import("bun").JSC.ErrorableResolvedSource;
+const ResolvedSource = @import("bun").JSC.ResolvedSource;
+const JSPromise = @import("bun").JSC.JSPromise;
+const JSInternalPromise = @import("bun").JSC.JSInternalPromise;
+const JSModuleLoader = @import("bun").JSC.JSModuleLoader;
+const JSPromiseRejectionOperation = @import("bun").JSC.JSPromiseRejectionOperation;
+const Exception = @import("bun").JSC.Exception;
+const ErrorableZigString = @import("bun").JSC.ErrorableZigString;
+const ZigGlobalObject = @import("bun").JSC.ZigGlobalObject;
+const VM = @import("bun").JSC.VM;
+const JSFunction = @import("bun").JSC.JSFunction;
 const Config = @import("../config.zig");
 const URL = @import("../../url.zig").URL;
 const Transpiler = @import("./transpiler.zig");
 const VirtualMachine = @import("../javascript.zig").VirtualMachine;
 const IOTask = JSC.IOTask;
 const is_bindgen = JSC.is_bindgen;
-const uws = @import("uws");
+const uws = @import("bun").uws;
 const Fallback = Runtime.Fallback;
 const MimeType = HTTP.MimeType;
 const Blob = JSC.WebCore.Blob;
-const BoringSSL = @import("boringssl");
+const BoringSSL = @import("bun").BoringSSL;
 const Arena = @import("../../mimalloc_arena.zig").Arena;
 const SendfileContext = struct {
     fd: i32,
@@ -90,7 +90,7 @@ const SendfileContext = struct {
     has_set_on_writable: bool = false,
     auto_close: bool = false,
 };
-const DateTime = @import("datetime");
+const DateTime = bun.DateTime;
 const linux = std.os.linux;
 
 pub const ServerConfig = struct {
diff --git a/src/bun.js/api/transpiler.zig b/src/bun.js/api/transpiler.zig
index cd47e1997..0bd525fde 100644
--- a/src/bun.js/api/transpiler.zig
+++ b/src/bun.js/api/transpiler.zig
@@ -4,9 +4,9 @@ const http = @import("../../http.zig");
 const JavaScript = @import("../javascript.zig");
 const QueryStringMap = @import("../../url.zig").QueryStringMap;
 const CombinedScanner = @import("../../url.zig").CombinedScanner;
-const bun = @import("../../global.zig");
+const bun = @import("bun");
 const string = bun.string;
-const JSC = @import("../../jsc.zig");
+const JSC = @import("bun").JSC;
 const js = JSC.C;
 const WebCore = @import("../webcore/response.zig");
 const Bundler = @import("../../bundler.zig");
@@ -21,7 +21,7 @@ const JSObject = JSC.JSObject;
 const JSError = Base.JSError;
 const JSValue = JSC.JSValue;
 const JSGlobalObject = JSC.JSGlobalObject;
-const strings = @import("strings");
+const strings = @import("bun").strings;
 const NewClass = Base.NewClass;
 const To = Base.To;
 const Request = WebCore.Request;
@@ -30,7 +30,7 @@ const FetchEvent = WebCore.FetchEvent;
 const MacroMap = @import("../../resolver/package_json.zig").MacroMap;
 const TSConfigJSON = @import("../../resolver/tsconfig_json.zig").TSConfigJSON;
 const PackageJSON = @import("../../resolver/package_json.zig").PackageJSON;
-const logger = @import("../../logger.zig");
+const logger = @import("bun").logger;
 const Loader = options.Loader;
 const Platform = options.Platform;
 const JSAst = @import("../../js_ast.zig");
diff --git a/src/bun.js/base.zig b/src/bun.js/base.zig
index 87ace2c54..6ca9e1084 100644
--- a/src/bun.js/base.zig
+++ b/src/bun.js/base.zig
@@ -1,6 +1,6 @@
-pub const js = @import("../jsc.zig").C;
+pub const js = @import("bun").JSC.C;
 const std = @import("std");
-const bun = @import("../global.zig");
+const bun = @import("bun");
 const string = bun.string;
 const Output = bun.Output;
 const Global = bun.Global;
@@ -13,7 +13,7 @@ const C = bun.C;
 const JavaScript = @import("./javascript.zig");
 const ResolveError = JavaScript.ResolveError;
 const BuildError = JavaScript.BuildError;
-const JSC = @import("../jsc.zig");
+const JSC = @import("bun").JSC;
 const WebCore = @import("./webcore.zig");
 const Test = @import("./test/jest.zig");
 const Fetch = WebCore.Fetch;
@@ -22,7 +22,7 @@ const Request = WebCore.Request;
 const Router = @import("./api/filesystem_router.zig");
 const FetchEvent = WebCore.FetchEvent;
 const IdentityContext = @import("../identity_context.zig").IdentityContext;
-const uws = @import("uws");
+const uws = @import("bun").uws;
 const Body = WebCore.Body;
 const TaggedPointerTypes = @import("../tagged_pointer.zig");
 const TaggedPointerUnion = TaggedPointerTypes.TaggedPointerUnion;
diff --git a/src/bun.js/bindings/bindings-generator.zig b/src/bun.js/bindings/bindings-generator.zig
index 5e7bd3e9b..893e808d4 100644
--- a/src/bun.js/bindings/bindings-generator.zig
+++ b/src/bun.js/bindings/bindings-generator.zig
@@ -15,7 +15,7 @@ const Allocator = std.mem.Allocator;
 
 pub const bindgen = true;
 
-const JSC = @import("../../jsc.zig");
+const JSC = @import("bun").JSC;
 
 const Classes = JSC.GlobalClasses;
 
diff --git a/src/bun.js/bindings/bindings.zig b/src/bun.js/bindings/bindings.zig
index 3fada34c4..eae673343 100644
--- a/src/bun.js/bindings/bindings.zig
+++ b/src/bun.js/bindings/bindings.zig
@@ -1,9 +1,9 @@
 const std = @import("std");
-const bun = @import("../../global.zig");
+const bun = @import("bun");
 const string = bun.string;
 const Output = bun.Output;
 const hasRef = std.meta.trait.hasField("ref");
-const C_API = @import("../../jsc.zig").C;
+const C_API = @import("bun").JSC.C;
 const StringPointer = @import("../../api/schema.zig").Api.StringPointer;
 const Exports = @import("./exports.zig");
 const strings = bun.strings;
@@ -13,7 +13,7 @@ const ZigException = Exports.ZigException;
 const ZigStackTrace = Exports.ZigStackTrace;
 const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false;
 const ArrayBuffer = @import("../base.zig").ArrayBuffer;
-const JSC = @import("../../jsc.zig");
+const JSC = @import("bun").JSC;
 const Shimmer = JSC.Shimmer;
 const FFI = @import("./FFI.zig");
 const NullableAllocator = @import("../../nullable_allocator.zig").NullableAllocator;
@@ -599,7 +599,7 @@ pub const ZigString = extern struct {
     }
 
     pub fn toJSStringRef(this: *const ZigString) C_API.JSStringRef {
-        if (comptime @hasDecl(@import("root"), "bindgen")) {
+        if (comptime @hasDecl(@import("bun"), "bindgen")) {
             return undefined;
         }
 
diff --git a/src/bun.js/bindings/exports.zig b/src/bun.js/bindings/exports.zig
index 92f269752..1842e52e5 100644
--- a/src/bun.js/bindings/exports.zig
+++ b/src/bun.js/bindings/exports.zig
@@ -1,14 +1,14 @@
-const JSC = @import("../../jsc.zig");
+const JSC = @import("bun").JSC;
 const Fs = @import("../../fs.zig");
 const CAPI = JSC.C;
 const JS = @import("../javascript.zig");
 const JSBase = @import("../base.zig");
 const ZigURL = @import("../../url.zig").URL;
 const Api = @import("../../api/schema.zig").Api;
-const bun = @import("../../global.zig");
+const bun = @import("bun");
 const std = @import("std");
 const Shimmer = @import("./shimmer.zig").Shimmer;
-const strings = @import("strings");
+const strings = @import("bun").strings;
 const default_allocator = bun.default_allocator;
 const NewGlobalObject = JSC.NewGlobalObject;
 const JSGlobalObject = JSC.JSGlobalObject;
diff --git a/src/bun.js/bindings/generated_classes.zig b/src/bun.js/bindings/generated_classes.zig
index 52e99fb82..7689dc4bb 100644
--- a/src/bun.js/bindings/generated_classes.zig
+++ b/src/bun.js/bindings/generated_classes.zig
@@ -1,4 +1,4 @@
-const JSC = @import("javascript_core");
+const JSC = @import("bun").JSC;
 const Classes = @import("./generated_classes_list.zig").Classes;
 const Environment = @import("../../env.zig");
 const std = @import("std");
diff --git a/src/bun.js/bindings/generated_classes_list.zig b/src/bun.js/bindings/generated_classes_list.zig
index 1dae06a3b..1c7dfc5ad 100644
--- a/src/bun.js/bindings/generated_classes_list.zig
+++ b/src/bun.js/bindings/generated_classes_list.zig
@@ -1,4 +1,4 @@
-const JSC = @import("javascript_core");
+const JSC = @import("bun").JSC;
 
 pub const Classes = struct {
     pub const Request = JSC.WebCore.Request;
diff --git a/src/bun.js/bindings/headers-cpp.h b/src/bun.js/bindings/headers-cpp.h
index 216a45292..f5e8576d6 100644
--- a/src/bun.js/bindings/headers-cpp.h
+++ b/src/bun.js/bindings/headers-cpp.h
@@ -1,4 +1,4 @@
-//-- AUTOGENERATED FILE -- 1669539205
+//-- AUTOGENERATED FILE -- 1669718575
 // clang-format off
 #pragma once
 
diff --git a/src/bun.js/bindings/headers-replacements.zig b/src/bun.js/bindings/headers-replacements.zig
index 5f304b850..f586bd028 100644
--- a/src/bun.js/bindings/headers-replacements.zig
+++ b/src/bun.js/bindings/headers-replacements.zig
@@ -1,4 +1,4 @@
-const bindings = @import("../../jsc.zig");
+const bindings = @import("bun").JSC;
 pub const struct_JSC__CallFrame = bindings.CallFrame;
 pub const struct_JSC__StringPrototype = bindings.StringPrototype;
 pub const struct_JSC__SetIteratorPrototype = bindings.SetIteratorPrototype;
diff --git a/src/bun.js/bindings/headers.h b/src/bun.js/bindings/headers.h
index 346cfa50e..663f4eadb 100644
--- a/src/bun.js/bindings/headers.h
+++ b/src/bun.js/bindings/headers.h
@@ -1,5 +1,5 @@
 // clang-format off
-//-- AUTOGENERATED FILE -- 1669680738
+//-- AUTOGENERATED FILE -- 1669718575
 #pragma once
 
 #include <stddef.h>
diff --git a/src/bun.js/bindings/headers.zig b/src/bun.js/bindings/headers.zig
index 55e947f02..8c83ed100 100644
--- a/src/bun.js/bindings/headers.zig
+++ b/src/bun.js/bindings/headers.zig
@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-const bindings = @import("../../jsc.zig");
+const bindings = @import("bun").JSC;
 pub const struct_JSC__CallFrame = bindings.CallFrame;
 pub const struct_JSC__StringPrototype = bindings.StringPrototype;
 pub const struct_JSC__SetIteratorPrototype = bindings.SetIteratorPrototype;
diff --git a/src/bun.js/config.zig b/src/bun.js/config.zig
index 8ec9238f6..78f76d9a4 100644
--- a/src/bun.js/config.zig
+++ b/src/bun.js/config.zig
@@ -1,4 +1,4 @@
-const bun = @import("../global.zig");
+const bun = @import("bun");
 const string = bun.string;
 const Output = bun.Output;
 const Global = bun.Global;
@@ -14,7 +14,7 @@ const Fs = @import("../fs.zig");
 const resolver = @import("../resolver/resolver.zig");
 const ast = @import("../import_record.zig");
 const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle;
-const logger = @import("../logger.zig");
+const logger = @import("bun").logger;
 const Api = @import("../api/schema.zig").Api;
 const options = @import("../options.zig");
 const Bundler = @import("../bundler.zig").ServeBundler;
diff --git a/src/bun.js/event_loop.zig b/src/bun.js/event_loop.zig
index d83bd3575..f9f11c943 100644
--- a/src/bun.js/event_loop.zig
+++ b/src/bun.js/event_loop.zig
@@ -1,10 +1,10 @@
 const std = @import("std");
-const JSC = @import("javascript_core");
+const JSC = @import("bun").JSC;
 const JSGlobalObject = JSC.JSGlobalObject;
 const VirtualMachine = JSC.VirtualMachine;
 const Lock = @import("../lock.zig").Lock;
 const Microtask = JSC.Microtask;
-const bun = @import("../global.zig");
+const bun = @import("bun");
 const Environment = bun.Environment;
 const Fetch = JSC.WebCore.Fetch;
 const WebCore = JSC.WebCore;
@@ -21,8 +21,8 @@ const JSValue = JSC.JSValue;
 const js = JSC.C;
 pub const WorkPool = @import("../work_pool.zig").WorkPool;
 pub const WorkPoolTask = @import("../work_pool.zig").Task;
-const NetworkThread = @import("http").NetworkThread;
-const uws = @import("uws");
+const NetworkThread = @import("bun").HTTP.NetworkThread;
+const uws = @import("bun").uws;
 
 pub fn ConcurrentPromiseTask(comptime Context: type) type {
     return struct {
@@ -209,7 +209,7 @@ pub const ConcurrentTask = struct {
     }
 };
 
-const AsyncIO = @import("io");
+const AsyncIO = @import("bun").AsyncIO;
 
 pub const EventLoop = struct {
     tasks: Queue = undefined,
diff --git a/src/bun.js/javascript.zig b/src/bun.js/javascript.zig
index 900f42ea1..6f966df2b 100644
--- a/src/bun.js/javascript.zig
+++ b/src/bun.js/javascript.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false;
 const StaticExport = @import("./bindings/static_export.zig");
 const c_char = StaticExport.c_char;
-const bun = @import("../global.zig");
+const bun = @import("bun");
 const string = bun.string;
 const Output = bun.Output;
 const Global = bun.Global;
@@ -14,8 +14,8 @@ const default_allocator = bun.default_allocator;
 const StoredFileDescriptorType = bun.StoredFileDescriptorType;
 const Arena = @import("../mimalloc_arena.zig").Arena;
 const C = bun.C;
-const NetworkThread = @import("http").NetworkThread;
-const IO = @import("io");
+const NetworkThread = @import("bun").HTTP.NetworkThread;
+const IO = @import("bun").AsyncIO;
 const Allocator = std.mem.Allocator;
 const IdentityContext = @import("../identity_context.zig").IdentityContext;
 const Fs = @import("../fs.zig");
@@ -24,7 +24,7 @@ const ast = @import("../import_record.zig");
 const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle;
 const MacroEntryPoint = @import("../bundler.zig").MacroEntryPoint;
 const ParseResult = @import("../bundler.zig").ParseResult;
-const logger = @import("../logger.zig");
+const logger = @import("bun").logger;
 const Api = @import("../api/schema.zig").Api;
 const options = @import("../options.zig");
 const Bundler = @import("../bundler.zig").Bundler;
@@ -38,46 +38,46 @@ const http = @import("../http.zig");
 const NodeFallbackModules = @import("../node_fallbacks.zig");
 const ImportKind = ast.ImportKind;
 const Analytics = @import("../analytics/analytics_thread.zig");
-const ZigString = @import("../jsc.zig").ZigString;
+const ZigString = @import("bun").JSC.ZigString;
 const Runtime = @import("../runtime.zig");
 const Router = @import("./api/filesystem_router.zig");
 const ImportRecord = ast.ImportRecord;
 const DotEnv = @import("../env_loader.zig");
 const PackageJSON = @import("../resolver/package_json.zig").PackageJSON;
 const MacroRemap = @import("../resolver/package_json.zig").MacroMap;
-const WebCore = @import("../jsc.zig").WebCore;
+const WebCore = @import("bun").JSC.WebCore;
 const Request = WebCore.Request;
 const Response = WebCore.Response;
 const Headers = WebCore.Headers;
 const Fetch = WebCore.Fetch;
 const FetchEvent = WebCore.FetchEvent;
-const js = @import("../jsc.zig").C;
-const JSC = @import("../jsc.zig");
+const js = @import("bun").JSC.C;
+const JSC = @import("bun").JSC;
 const JSError = @import("./base.zig").JSError;
 const d = @import("./base.zig").d;
 const MarkedArrayBuffer = @import("./base.zig").MarkedArrayBuffer;
 const getAllocator = @import("./base.zig").getAllocator;
-const JSValue = @import("../jsc.zig").JSValue;
+const JSValue = @import("bun").JSC.JSValue;
 const NewClass = @import("./base.zig").NewClass;
-const Microtask = @import("../jsc.zig").Microtask;
-const JSGlobalObject = @import("../jsc.zig").JSGlobalObject;
-const ExceptionValueRef = @import("../jsc.zig").ExceptionValueRef;
-const JSPrivateDataPtr = @import("../jsc.zig").JSPrivateDataPtr;
-const ZigConsoleClient = @import("../jsc.zig").ZigConsoleClient;
-const Node = @import("../jsc.zig").Node;
-const ZigException = @import("../jsc.zig").ZigException;
-const ZigStackTrace = @import("../jsc.zig").ZigStackTrace;
-const ErrorableResolvedSource = @import("../jsc.zig").ErrorableResolvedSource;
-const ResolvedSource = @import("../jsc.zig").ResolvedSource;
-const JSPromise = @import("../jsc.zig").JSPromise;
-const JSInternalPromise = @import("../jsc.zig").JSInternalPromise;
-const JSModuleLoader = @import("../jsc.zig").JSModuleLoader;
-const JSPromiseRejectionOperation = @import("../jsc.zig").JSPromiseRejectionOperation;
-const Exception = @import("../jsc.zig").Exception;
-const ErrorableZigString = @import("../jsc.zig").ErrorableZigString;
-const ZigGlobalObject = @import("../jsc.zig").ZigGlobalObject;
-const VM = @import("../jsc.zig").VM;
-const JSFunction = @import("../jsc.zig").JSFunction;
+const Microtask = @import("bun").JSC.Microtask;
+const JSGlobalObject = @import("bun").JSC.JSGlobalObject;
+const ExceptionValueRef = @import("bun").JSC.ExceptionValueRef;
+const JSPrivateDataPtr = @import("bun").JSC.JSPrivateDataPtr;
+const ZigConsoleClient = @import("bun").JSC.ZigConsoleClient;
+const Node = @import("bun").JSC.Node;
+const ZigException = @import("bun").JSC.ZigException;
+const ZigStackTrace = @import("bun").JSC.ZigStackTrace;
+const ErrorableResolvedSource = @import("bun").JSC.ErrorableResolvedSource;
+const ResolvedSource = @import("bun").JSC.ResolvedSource;
+const JSPromise = @import("bun").JSC.JSPromise;
+const JSInternalPromise = @import("bun").JSC.JSInternalPromise;
+const JSModuleLoader = @import("bun").JSC.JSModuleLoader;
+const JSPromiseRejectionOperation = @import("bun").JSC.JSPromiseRejectionOperation;
+const Exception = @import("bun").JSC.Exception;
+const ErrorableZigString = @import("bun").JSC.ErrorableZigString;
+const ZigGlobalObject = @import("bun").JSC.ZigGlobalObject;
+const VM = @import("bun").JSC.VM;
+const JSFunction = @import("bun").JSC.JSFunction;
 const Config = @import("./config.zig");
 const URL = @import("../url.zig").URL;
 const Transpiler = @import("./api/transpiler.zig");
@@ -244,7 +244,7 @@ pub const SavedSourceMap = struct {
         return SourceMap.Mapping.find(mappings, line, column);
     }
 };
-const uws = @import("uws");
+const uws = @import("bun").uws;
 
 pub export fn Bun__getDefaultGlobal() *JSGlobalObject {
     return JSC.VirtualMachine.vm.global;
diff --git a/src/bun.js/javascript_core_c_api.zig b/src/bun.js/javascript_core_c_api.zig
index d3df574ab..13e96f22a 100644
--- a/src/bun.js/javascript_core_c_api.zig
+++ b/src/bun.js/javascript_core_c_api.zig
@@ -1,4 +1,4 @@
-const bun = @import("../global.zig");
+const bun = @import("bun");
 const std = @import("std");
 const cpp = @import("./bindings/bindings.zig");
 const generic = opaque {
@@ -6,7 +6,7 @@ const generic = opaque {
         return @bitCast(cpp.JSValue.Type, @ptrToInt(this));
     }
 
-    pub inline fn bunVM(this: *@This()) *@import("javascript_core").VirtualMachine {
+    pub inline fn bunVM(this: *@This()) *@import("bun").JSC.VirtualMachine {
         return this.ptr().bunVM();
     }
 };
@@ -174,13 +174,13 @@ pub extern fn JSValueToNumber(ctx: JSContextRef, value: JSValueRef, exception: E
 pub extern fn JSValueToStringCopy(ctx: JSContextRef, value: JSValueRef, exception: ExceptionRef) JSStringRef;
 pub extern fn JSValueToObject(ctx: JSContextRef, value: JSValueRef, exception: ExceptionRef) JSObjectRef;
 
-const log_protection = @import("../global.zig").Environment.allow_assert and false;
+const log_protection = @import("bun").Environment.allow_assert and false;
 pub inline fn JSValueUnprotect(ctx: JSContextRef, value: JSValueRef) void {
     const Wrapped = struct {
         pub extern fn JSValueUnprotect(ctx: JSContextRef, value: JSValueRef) void;
     };
     if (comptime log_protection) {
-        const Output = @import("../global.zig").Output;
+        const Output = @import("bun").Output;
         Output.debug("[unprotect] {d}\n", .{@ptrToInt(value)});
     }
     // wrapper exists to make it easier to set a breakpoint
@@ -192,7 +192,7 @@ pub inline fn JSValueProtect(ctx: JSContextRef, value: JSValueRef) void {
         pub extern fn JSValueProtect(ctx: JSContextRef, value: JSValueRef) void;
     };
     if (comptime log_protection) {
-        const Output = @import("../global.zig").Output;
+        const Output = @import("bun").Output;
         Output.debug("[protect] {d}\n", .{@ptrToInt(value)});
     }
     // wrapper exists to make it easier to set a breakpoint
diff --git a/src/bun.js/module_loader.zig b/src/bun.js/module_loader.zig
index 01dbbe1a3..fa938f1ab 100644
--- a/src/bun.js/module_loader.zig
+++ b/src/bun.js/module_loader.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false;
 const StaticExport = @import("./bindings/static_export.zig");
 const c_char = StaticExport.c_char;
-const bun = @import("../global.zig");
+const bun = @import("bun");
 const string = bun.string;
 const Output = bun.Output;
 const Global = bun.Global;
@@ -14,8 +14,8 @@ const default_allocator = bun.default_allocator;
 const StoredFileDescriptorType = bun.StoredFileDescriptorType;
 const Arena = @import("../mimalloc_arena.zig").Arena;
 const C = bun.C;
-const NetworkThread = @import("http").NetworkThread;
-const IO = @import("io");
+const NetworkThread = @import("bun").HTTP.NetworkThread;
+const IO = @import("bun").AsyncIO;
 const Allocator = std.mem.Allocator;
 const IdentityContext = @import("../identity_context.zig").IdentityContext;
 const Fs = @import("../fs.zig");
@@ -24,7 +24,7 @@ const ast = @import("../import_record.zig");
 const NodeModuleBundle = @import("../node_module_bundle.zig").NodeModuleBundle;
 const MacroEntryPoint = @import("../bundler.zig").MacroEntryPoint;
 const ParseResult = @import("../bundler.zig").ParseResult;
-const logger = @import("../logger.zig");
+const logger = @import("bun").logger;
 const Api = @import("../api/schema.zig").Api;
 const options = @import("../options.zig");
 const Bundler = @import("../bundler.zig").Bundler;
@@ -38,46 +38,46 @@ const http = @import("../http.zig");
 const NodeFallbackModules = @import("../node_fallbacks.zig");
 const ImportKind = ast.ImportKind;
 const Analytics = @import("../analytics/analytics_thread.zig");
-const ZigString = @import("../jsc.zig").ZigString;
+const ZigString = @import("bun").JSC.ZigString;
 const Runtime = @import("../runtime.zig");
 const Router = @import("./api/filesystem_router.zig");
 const ImportRecord = ast.ImportRecord;
 const DotEnv = @import("../env_loader.zig");
 const PackageJSON = @import("../resolver/package_json.zig").PackageJSON;
 const MacroRemap = @import("../resolver/package_json.zig").MacroMap;
-const WebCore = @import("../jsc.zig").WebCore;
+const WebCore = @import("bun").JSC.WebCore;
 const Request = WebCore.Request;
 const Response = WebCore.Response;
 const Headers = WebCore.Headers;
 const Fetch = WebCore.Fetch;
 const FetchEvent = WebCore.FetchEvent;
-const js = @import("../jsc.zig").C;
-const JSC = @import("../jsc.zig");
+const js = @import("bun").JSC.C;
+const JSC = @import("bun").JSC;
 const JSError = @import("./base.zig").JSError;
 const d = @import("./base.zig").d;
 const MarkedArrayBuffer = @import("./base.zig").MarkedArrayBuffer;
 const getAllocator = @import("./base.zig").getAllocator;
-const JSValue = @import("../jsc.zig").JSValue;
+const JSValue = @import("bun").JSC.JSValue;
 const NewClass = @import("./base.zig").NewClass;
-const Microtask = @import("../jsc.zig").Microtask;
-const JSGlobalObject = @import("../jsc.zig").JSGlobalObject;
-const ExceptionValueRef = @import("../jsc.zig").ExceptionValueRef;
-const JSPrivateDataPtr = @import("../jsc.zig").JSPrivateDataPtr;
-const ZigConsoleClient = @import("../jsc.zig").ZigConsoleClient;
-const Node = @import("../jsc.zig").Node;
-const ZigException = @import("../jsc.zig").ZigException;
-const ZigStackTrace = @import("../jsc.zig").ZigStackTrace;
-const ErrorableResolvedSource = @import("../jsc.zig").ErrorableResolvedSource;
-const ResolvedSource = @import("../jsc.zig").ResolvedSource;
-const JSPromise = @import("../jsc.zig").JSPromise;
-const JSInternalPromise = @import("../jsc.zig").JSInternalPromise;
-const JSModuleLoader = @import("../jsc.zig").JSModuleLoader;
-const JSPromiseRejectionOperation = @import("../jsc.zig").JSPromiseRejectionOperation;
-const Exception = @import("../jsc.zig").Exception;
-const ErrorableZigString = @import("../jsc.zig").ErrorableZigString;
-const ZigGlobalObject = @import("../jsc.zig").ZigGlobalObject;
-const VM = @import("../jsc.zig").VM;
-const JSFunction = @import("../jsc.zig").JSFunction;
+const Microtask = @import("bun").JSC.Microtask;
+const JSGlobalObject = @import("bun").JSC.JSGlobalObject;
+const ExceptionValueRef = @import("bun").JSC.ExceptionValueRef;
+const JSPrivateDataPtr = @import("bun").JSC.JSPrivateDataPtr;
+const ZigConsoleClient = @import("bun").JSC.ZigConsoleClient;
+const Node = @import("bun").JSC.Node;
+const ZigException = @import("bun").JSC.ZigException;
+const ZigStackTrace = @import("bun").JSC.ZigStackTrace;
+const ErrorableResolvedSource = @import("bun").JSC.ErrorableResolvedSource;
+const ResolvedSource = @import("bun").JSC.ResolvedSource;
+const JSPromise = @import("bun").JSC.JSPromise;
+const JSInternalPromise = @import("bun").JSC.JSInternalPromise;
+const JSModuleLoader = @import("bun").JSC.JSModuleLoader;
+const JSPromiseRejectionOperation = @import("bun").JSC.JSPromiseRejectionOperation;
+const Exception = @import("bun").JSC.Exception;
+const ErrorableZigString = @import("bun").JSC.ErrorableZigString;
+const ZigGlobalObject = @import("bun").JSC.ZigGlobalObject;
+const VM = @import("bun").JSC.VM;
+const JSFunction = @import("bun").JSC.JSFunction;
 const Config = @import("./config.zig");
 const URL = @import("../url.zig").URL;
 const Transpiler = @import("./api/transpiler.zig");
diff --git a/src/bun.js/node/buffer.zig b/src/bun.js/node/buffer.zig
index 541079a0b..b796109e3 100644
--- a/src/bun.js/node/buffer.zig
+++ b/src/bun.js/node/buffer.zig
@@ -1,9 +1,9 @@
 const std = @import("std");
-const bun = @import("../../global.zig");
+const bun = @import("bun");
 const strings = bun.strings;
 const string = bun.string;
-const AsyncIO = @import("io");
-const JSC = @import("../../jsc.zig");
+const AsyncIO = @import("bun").AsyncIO;
+const JSC = @import("bun").JSC;
 const PathString = JSC.PathString;
 const Environment = bun.Environment;
 const C = bun.C;
diff --git a/src/bun.js/node/dir_iterator.zig b/src/bun.js/node/dir_iterator.zig
index 19db4177d..c309e0d67 100644
--- a/src/bun.js/node/dir_iterator.zig
+++ b/src/bun.js/node/dir_iterator.zig
@@ -9,12 +9,12 @@ const std = @import("std");
 const os = std.os;
 
 const Dir = std.fs.Dir;
-const JSC = @import("../../jsc.zig");
+const JSC = @import("bun").JSC;
 const PathString = JSC.PathString;
 
 const IteratorError = error{ AccessDenied, SystemResources } || os.UnexpectedError;
 const mem = std.mem;
-const strings = @import("../../global.zig").strings;
+const strings = @import("bun").strings;
 const Maybe = JSC.Maybe;
 const File = std.fs.File;
 const Result = Maybe(?Entry);
diff --git a/src/bun.js/node/node_fs.zig b/src/bun.js/node/node_fs.zig
index 394e705db..dd11d40bf 100644
--- a/src/bun.js/node/node_fs.zig
+++ b/src/bun.js/node/node_fs.zig
@@ -2,11 +2,11 @@
 // for interacting with the filesystem from JavaScript.
 // The top-level functions assume the arguments are already validated
 const std = @import("std");
-const bun = @import("../../global.zig");
+const bun = @import("bun");
 const strings = bun.strings;
 const string = bun.string;
-const AsyncIO = @import("io");
-const JSC = @import("../../jsc.zig");
+const AsyncIO = @import("bun").AsyncIO;
+const JSC = @import("bun").JSC;
 const PathString = JSC.PathString;
 const Environment = bun.Environment;
 const C = bun.C;
diff --git a/src/bun.js/node/node_fs_binding.zig b/src/bun.js/node/node_fs_binding.zig
index a76c83637..e88e0cbf7 100644
--- a/src/bun.js/node/node_fs_binding.zig
+++ b/src/bun.js/node/node_fs_binding.zig
@@ -1,11 +1,11 @@
-const JSC = @import("../../jsc.zig");
+const JSC = @import("bun").JSC;
 const std = @import("std");
 const Flavor = JSC.Node.Flavor;
 const ArgumentsSlice = JSC.Node.ArgumentsSlice;
 const system = std.os.system;
 const Maybe = JSC.Maybe;
 const Encoding = JSC.Node.Encoding;
-const FeatureFlags = @import("../../global.zig").FeatureFlags;
+const FeatureFlags = @import("bun").FeatureFlags;
 const Args = JSC.Node.NodeFS.Arguments;
 const d = JSC.d;
 
diff --git a/src/bun.js/node/node_fs_constant.zig b/src/bun.js/node/node_fs_constant.zig
index 72e752184..6491664db 100644
--- a/src/bun.js/node/node_fs_constant.zig
+++ b/src/bun.js/node/node_fs_constant.zig
@@ -1,4 +1,4 @@
-const bun = @import("../../global.zig");
+const bun = @import("bun");
 const Environment = bun.Environment;
 const std = @import("std");
 
diff --git a/src/bun.js/node/node_os.zig b/src/bun.js/node/node_os.zig
index fb5ce0879..bcaffaf17 100644
--- a/src/bun.js/node/node_os.zig
+++ b/src/bun.js/node/node_os.zig
@@ -1,10 +1,10 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const bun = @import("../../global.zig");
+const bun = @import("bun");
 const C = bun.C;
 const string = bun.string;
 const strings = bun.strings;
-const JSC = @import("../../jsc.zig");
+const JSC = @import("bun").JSC;
 const Environment = bun.Environment;
 const Global = bun.Global;
 const is_bindgen: bool = std.meta.globalOption("bindgen", bool) orelse false;
diff --git a/src/bun.js/node/os/constants.zig b/src/bun.js/node/os/constants.zig
index 6a217c32e..2d441b793 100644
--- a/src/bun.js/node/os/constants.zig
+++ b/src/bun.js/node/os/constants.zig
@@ -1,8 +1,8 @@
 const std = @import("std");
-const bun = @import("../../../global.zig");
+const bun = @import("bun");
 const string = bun.string;
 const Environment = bun.Environment;
-const JSC = @import("../../../jsc.zig");
+const JSC = @import("bun").JSC;
 
 const ConstantType = enum { ERRNO, ERRNO_WIN, SIG, DLOPEN, OTHER };
 
diff --git a/src/bun.js/node/syscall.zig b/src/bun.js/node/syscall.zig
index cb423c2f5..50ba6e33f 100644
--- a/src/bun.js/node/syscall.zig
+++ b/src/bun.js/node/syscall.zig
@@ -5,14 +5,14 @@ const os = std.os;
 const builtin = @import("builtin");
 
 const Syscall = @This();
-const Environment = @import("../../global.zig").Environment;
-const default_allocator = @import("../../global.zig").default_allocator;
-const JSC = @import("../../jsc.zig");
+const Environment = @import("bun").Environment;
+const default_allocator = @import("bun").default_allocator;
+const JSC = @import("bun").JSC;
 const SystemError = JSC.SystemError;
-const bun = @import("../../global.zig");
+const bun = @import("bun");
 const MAX_PATH_BYTES = bun.MAX_PATH_BYTES;
 const fd_t = bun.FileDescriptor;
-const C = @import("../../global.zig").C;
+const C = @import("bun").C;
 const linux = os.linux;
 const Maybe = JSC.Maybe;
 
@@ -21,7 +21,7 @@ pub const syslog = log;
 
 // On Linux AARCh64, zig is missing stat & lstat syscalls
 const use_libc = (Environment.isLinux and Environment.isAarch64) or Environment.isMac;
-pub const system = if (Environment.isLinux) linux else @import("io").darwin;
+pub const system = if (Environment.isLinux) linux else @import("bun").AsyncIO.darwin;
 pub const S = struct {
     pub usingnamespace if (Environment.isLinux) linux.S else std.os.S;
 };
@@ -107,7 +107,7 @@ pub const Tag = enum(u8) {
     posix_spawn,
     pub var strings = std.EnumMap(Tag, JSC.C.JSStringRef).initFull(null);
 };
-const PathString = @import("../../global.zig").PathString;
+const PathString = @import("bun").PathString;
 
 const mode_t = os.mode_t;
 
diff --git a/src/bun.js/node/types.zig b/src/bun.js/node/types.zig
index 020fd5f2d..a7443875f 100644
--- a/src/bun.js/node/types.zig
+++ b/src/bun.js/node/types.zig
@@ -1,10 +1,10 @@
 const std = @import("std");
 const builtin = @import("builtin");
-const bun = @import("../../global.zig");
+const bun = @import("bun");
 const strings = bun.strings;
 const string = bun.string;
-const AsyncIO = @import("io");
-const JSC = @import("../../jsc.zig");
+const AsyncIO = @import("bun").AsyncIO;
+const JSC = @import("bun").JSC;
 const PathString = JSC.PathString;
 const Environment = bun.Environment;
 const C = bun.C;
@@ -12,7 +12,7 @@ const Syscall = @import("./syscall.zig");
 const os = std.os;
 const Buffer = JSC.MarkedArrayBuffer;
 const IdentityContext = @import("../../identity_context.zig").IdentityContext;
-const logger = @import("../../logger.zig");
+const logger = @import("bun").logger;
 const Fs = @import("../../fs.zig");
 const URL = @import("../../url.zig").URL;
 const Shimmer = @import("../bindings/shimmer.zig").Shimmer;
diff --git a/src/bun.js/rare_data.zig b/src/bun.js/rare_data.zig
index 895dac40f..bb52e5bea 100644
--- a/src/bun.js/rare_data.zig
+++ b/src/bun.js/rare_data.zig
@@ -1,13 +1,13 @@
 const EditorContext = @import("../open.zig").EditorContext;
 const Blob = @import("./webcore/response.zig").Blob;
-const default_allocator = @import("../global.zig").default_allocator;
-const Output = @import("../global.zig").Output;
+const default_allocator = @import("bun").default_allocator;
+const Output = @import("bun").Output;
 const RareData = @This();
 const Syscall = @import("./node/syscall.zig");
-const JSC = @import("javascript_core");
+const JSC = @import("bun").JSC;
 const std = @import("std");
-const BoringSSL = @import("boringssl");
-const bun = @import("../global.zig");
+const BoringSSL = @import("bun").BoringSSL;
+const bun = @import("bun");
 const WebSocketClientMask = @import("../http/websocket_http_client.zig").Mask;
 
 boring_ssl_engine: ?*BoringSSL.ENGINE = null,
diff --git a/src/bun.js/script_execution_context.zig b/src/bun.js/script_execution_context.zig
index 551614ccc..0f1bfb20b 100644
--- a/src/bun.js/script_execution_context.zig
+++ b/src/bun.js/script_execution_context.zig
@@ -1,4 +1,4 @@
-const JSC = @import("../jsc.zig");
+const JSC = @import("bun").JSC;
 
 pub const ScriptExecutionContext = extern struct {
     main_file_path: JSC.ZigString,
diff --git a/src/bun.js/scripts/generate-classes.ts b/src/bun.js/scripts/generate-classes.ts
index 05b092656..b08e573b4 100644
--- a/src/bun.js/scripts/generate-classes.ts
+++ b/src/bun.js/scripts/generate-classes.ts
@@ -1743,7 +1743,7 @@ void GlobalObject::visitGeneratedLazyClasses(GlobalObject *thisObject, Visitor&
 }
 
 const ZIG_GENERATED_CLASSES_HEADER = `
-const JSC = @import("javascript_core");
+const JSC = @import("bun").JSC;
 const Classes = @import("./generated_classes_list.zig").Classes;
 const Environment = @import("../../env.zig");
 const std = @import("std");
diff --git a/src/bun.js/test/jest.zig b/src/bun.js/test/jest.zig
index 34265789f..abde377db 100644
--- a/src/bun.js/test/jest.zig
+++ b/src/bun.js/test/jest.zig
@@ -1,27 +1,27 @@
 const std = @import("std");
-const bun = @import("../../global.zig");
+const bun = @import("bun");
 const Api = @import("../../api/schema.zig").Api;
 const RequestContext = @import("../../http.zig").RequestContext;
 const MimeType = @import("../../http.zig").MimeType;
 const ZigURL = @import("../../url.zig").URL;
-const HTTPClient = @import("http");
+const HTTPClient = @import("bun").HTTP;
 const NetworkThread = HTTPClient.NetworkThread;
 const Environment = @import("../../env.zig");
 
-const JSC = @import("../../jsc.zig");
+const JSC = @import("bun").JSC;
 const js = JSC.C;
 
-const logger = @import("../../logger.zig");
+const logger = @import("bun").logger;
 const Method = @import("../../http/method.zig").Method;
 
 const ObjectPool = @import("../../pool.zig").ObjectPool;
 
-const Output = @import("../../global.zig").Output;
-const MutableString = @import("../../global.zig").MutableString;
-const strings = @import("../../global.zig").strings;
-const string = @import("../../global.zig").string;
-const default_allocator = @import("../../global.zig").default_allocator;
-const FeatureFlags = @import("../../global.zig").FeatureFlags;
+const Output = @import("bun").Output;
+const MutableString = @import("bun").MutableString;
+const strings = @import("bun").strings;
+const string = @import("bun").string;
+const default_allocator = @import("bun").default_allocator;
+const FeatureFlags = @import("bun").FeatureFlags;
 const ArrayBuffer = @import("../base.zig").ArrayBuffer;
 const Properties = @import("../base.zig").Properties;
 const NewClass = @import("../base.zig").NewClass;
diff --git a/src/bun.js/uuid.zig b/src/bun.js/uuid.zig
index fa59520c2..affd07a32 100644
--- a/src/bun.js/uuid.zig
+++ b/src/bun.js/uuid.zig
@@ -3,7 +3,7 @@ const std = @import("std");
 const crypto = std.crypto;
 const fmt = std.fmt;
 const testing = std.testing;
-const bun = @import("../global.zig");
+const bun = @import("bun");
 
 pub const Error = error{InvalidUUID};
 const UUID = @This();
diff --git a/src/bun.js/webcore.zig b/src/bun.js/webcore.zig
index c8bf7545d..21751ce5a 100644
--- a/src/bun.js/webcore.zig
+++ b/src/bun.js/webcore.zig
@@ -2,9 +2,9 @@ pub usingnamespace @import("./webcore/response.zig");
 pub usingnamespace @import("./webcore/encoding.zig");
 pub usingnamespace @import("./webcore/streams.zig");
 
-const JSC = @import("../jsc.zig");
+const JSC = @import("bun").JSC;
 const std = @import("std");
-const bun = @import("../global.zig");
+const bun = @import("bun");
 
 pub const Lifetime = enum {
     clone,
@@ -358,7 +358,7 @@ pub const Prompt = struct {
 
 pub const Crypto = struct {
     const UUID = @import("./uuid.zig");
-    const BoringSSL = @import("boringssl");
+    const BoringSSL = @import("bun").BoringSSL;
     pub const Class = JSC.NewClass(
         void,
         .{ .name = "crypto" },
diff --git a/src/bun.js/webcore/encoding.zig b/src/bun.js/webcore/encoding.zig
index 297f3cc0a..a3b350899 100644
--- a/src/bun.js/webcore/encoding.zig
+++ b/src/bun.js/webcore/encoding.zig
@@ -3,22 +3,22 @@ const Api = @import("../../api/schema.zig").Api;
 const RequestContext = @import("../../http.zig").RequestContext;
 const MimeType = @import("../../http.zig").MimeType;
 const ZigURL = @import("../../url.zig").URL;
-const HTTPClient = @import("http");
+const HTTPClient = @import("bun").HTTP;
 const NetworkThread = HTTPClient.NetworkThread;
 
-const JSC = @import("../../jsc.zig");
+const JSC = @import("bun").JSC;
 const js = JSC.C;
 
 const Method = @import("../../http/method.zig").Method;
 
 const ObjectPool = @import("../../pool.zig").ObjectPool;
-const bun = @import("../../global.zig");
-const Output = @import("../../global.zig").Output;
-const MutableString = @import("../../global.zig").MutableString;
-const strings = @import("../../global.zig").strings;
-const string = @import("../../global.zig").string;
-const default_allocator = @import("../../global.zig").default_allocator;
-const FeatureFlags = @import("../../global.zig").FeatureFlags;
+const bun = @import("bun");
+const Output = @import("bun").Output;
+const MutableString = @import("bun").MutableString;
+const strings = @import("bun").strings;
+const string = @import("bun").string;
+const default_allocator = @import("bun").default_allocator;
+const FeatureFlags = @import("bun").FeatureFlags;
 const ArrayBuffer = @import("../base.zig").ArrayBuffer;
 const Properties = @import("../base.zig").Properties;
 const NewClass = @import("../base.zig").NewClass;
@@ -38,7 +38,7 @@ const JSGlobalObject = JSC.JSGlobalObject;
 const VirtualMachine = @import("../javascript.zig").VirtualMachine;
 const Task = @import("../javascript.zig").Task;
 
-const picohttp = @import("picohttp");
+const picohttp = @import("bun").picohttp;
 
 pub const TextEncoder = struct {
     filler: u32 = 0,
diff --git a/src/bun.js/webcore/response.zig b/src/bun.js/webcore/response.zig
index 936a5e464..6744df60f 100644
--- a/src/bun.js/webcore/response.zig
+++ b/src/bun.js/webcore/response.zig
@@ -1,25 +1,25 @@
 const std = @import("std");
 const Api = @import("../../api/schema.zig").Api;
-const bun = @import("../../global.zig");
+const bun = @import("bun");
 const RequestContext = @import("../../http.zig").RequestContext;
 const MimeType = @import("../../http.zig").MimeType;
 const ZigURL = @import("../../url.zig").URL;
-const HTTPClient = @import("http");
+const HTTPClient = @import("bun").HTTP;
 const NetworkThread = HTTPClient.NetworkThread;
 const AsyncIO = NetworkThread.AsyncIO;
-const JSC = @import("javascript_core");
+const JSC = @import("bun").JSC;
 const js = JSC.C;
 
 const Method = @import("../../http/method.zig").Method;
 const FetchHeaders = JSC.FetchHeaders;
 const ObjectPool = @import("../../pool.zig").ObjectPool;
 const SystemError = JSC.SystemError;
-const Output = @import("../../global.zig").Output;
-const MutableString = @import("../../global.zig").MutableString;
-const strings = @import("../../global.zig").strings;
-const string = @import("../../global.zig").string;
-const default_allocator = @import("../../global.zig").default_allocator;
-const FeatureFlags = @import("../../global.zig").FeatureFlags;
+const Output = @import("bun").Output;
+const MutableString = @import("bun").MutableString;
+const strings = @import("bun").strings;
+const string = @import("bun").string;
+const default_allocator = @import("bun").default_allocator;
+const FeatureFlags = @import("bun").FeatureFlags;
 const ArrayBuffer = @import("../base.zig").ArrayBuffer;
 const Properties = @import("../base.zig").Properties;
 const NewClass = @import("../base.zig").NewClass;
@@ -40,9 +40,9 @@ const NullableAllocator = @import("../../nullable_allocator.zig").NullableAlloca
 const VirtualMachine = @import("../javascript.zig").VirtualMachine;
 const Task = JSC.Task;
 const JSPrinter = @import("../../js_printer.zig");
-const picohttp = @import("picohttp");
+const picohttp = @import("bun").picohttp;
 const StringJoiner = @import("../../string_joiner.zig");
-const uws = @import("uws");
+const uws = @import("bun").uws;
 
 pub const Response = struct {
     pub usingnamespace JSC.Codegen.JSResponse;
diff --git a/src/bun.js/webcore/streams.zig b/src/bun.js/webcore/streams.zig
index 263525ab8..0cd35a3ee 100644
--- a/src/bun.js/webcore/streams.zig
+++ b/src/bun.js/webcore/streams.zig
@@ -1,25 +1,25 @@
 const std = @import("std");
 const Api = @import("../../api/schema.zig").Api;
-const bun = @import("../../global.zig");
+const bun = @import("bun");
 const RequestContext = @import("../../http.zig").RequestContext;
 const MimeType = @import("../../http.zig").MimeType;
 const ZigURL = @import("../../url.zig").URL;
-const HTTPClient = @import("http");
+const HTTPClient = @import("bun").HTTP;
 const NetworkThread = HTTPClient.NetworkThread;
 const AsyncIO = NetworkThread.AsyncIO;
-const JSC = @import("javascript_core");
+const JSC = @import("bun").JSC;
 const js = JSC.C;
 
 const Method = @import("../../http/method.zig").Method;
 const FetchHeaders = JSC.FetchHeaders;
 const ObjectPool = @import("../../pool.zig").ObjectPool;
 const SystemError = JSC.SystemError;
-const Output = @import("../../global.zig").Output;
-const MutableString = @import("../../global.zig").MutableString;
-const strings = @import("../../global.zig").strings;
-const string = @import("../../global.zig").string;
-const default_allocator = @import("../../global.zig").default_allocator;
-const FeatureFlags = @import("../../global.zig").FeatureFlags;
+const Output = @import("bun").Output;
+const MutableString = @import("bun").MutableString;
+const strings = @import("bun").strings;
+const string = @import("bun").string;
+const default_allocator = @import("bun").default_allocator;
+const FeatureFlags = @import("bun").FeatureFlags;
 const ArrayBuffer = @import("../base.zig").ArrayBuffer;
 const Properties = @import("../base.zig").Properties;
 const NewClass = @import("../base.zig").NewClass;
@@ -40,9 +40,9 @@ const JSGlobalObject = JSC.JSGlobalObject;
 const VirtualMachine = @import("../javascript.zig").VirtualMachine;
 const Task = JSC.Task;
 const JSPrinter = @import("../../js_printer.zig");
-const picohttp = @import("picohttp");
+const picohttp = @import("bun").picohttp;
 const StringJoiner = @import("../../string_joiner.zig");
-const uws = @import("uws");
+const uws = @import("bun").uws;
 const Blob = JSC.WebCore.Blob;
 const Response = JSC.WebCore.Response;
 const Request = JSC.WebCore.Request;