diff --git a/cmake/Sources.json b/cmake/Sources.json
index f11fdbe026..fb2b85c25d 100644
--- a/cmake/Sources.json
+++ b/cmake/Sources.json
@@ -57,6 +57,7 @@
       "src/buntime/bindings/v8/shim/*.cpp",
       "src/buntime/api/console/*.cpp",
       "src/buntime/api/inspector/*.cpp",
+      "src/buntime/api/error/*.cpp",
       "src/bake/*.cpp",
       "src/deps/*.cpp",
       "src/vm/*.cpp",
diff --git a/cmake/targets/BuildBun.cmake b/cmake/targets/BuildBun.cmake
index 0c480d18cc..1ef6978f20 100644
--- a/cmake/targets/BuildBun.cmake
+++ b/cmake/targets/BuildBun.cmake
@@ -225,9 +225,9 @@ set(BUN_ERROR_CODE_SCRIPT ${CWD}/src/codegen/generate-node-errors.ts)
 
 set(BUN_ERROR_CODE_SOURCES
   ${BUN_ERROR_CODE_SCRIPT}
-  ${CWD}/src/buntime/bindings/ErrorCode.ts
-  ${CWD}/src/buntime/bindings/ErrorCode.cpp
-  ${CWD}/src/buntime/bindings/ErrorCode.h
+  ${CWD}/src/buntime/api/error/ErrorCode.ts
+  ${CWD}/src/buntime/api/error/ErrorCode.cpp
+  ${CWD}/src/buntime/api/error/ErrorCode.h
 )
 
 set(BUN_ERROR_CODE_OUTPUTS
@@ -591,12 +591,12 @@ foreach(i RANGE 0 ${BUN_OBJECT_LUT_SOURCES_MAX_INDEX})
 endforeach()
 
 WEBKIT_ADD_SOURCE_DEPENDENCIES(
-  ${CWD}/src/buntime/bindings/ErrorCode.cpp
+  ${CWD}/src/buntime/api/error/ErrorCode.cpp
   ${CODEGEN_PATH}/ErrorCode+List.h
 )
 
 WEBKIT_ADD_SOURCE_DEPENDENCIES(
-  ${CWD}/src/buntime/bindings/ErrorCode.h
+  ${CWD}/src/buntime/api/error/ErrorCode.h
   ${CODEGEN_PATH}/ErrorCode+Data.h
 )
 
@@ -867,6 +867,7 @@ target_include_directories(${bun} PRIVATE
   ${CWD}/src/buntime/bindings/v8
   ${CWD}/src/buntime/api/console
   ${CWD}/src/buntime/api/inspector
+  ${CWD}/src/buntime/api/error
   ${CWD}/src/buntime/modules
   ${CWD}/src/js/builtins
   ${CWD}/src/napi
diff --git a/src/buntime/bindings/DeferredError.zig b/src/buntime/api/error/DeferredError.zig
similarity index 94%
rename from src/buntime/bindings/DeferredError.zig
rename to src/buntime/api/error/DeferredError.zig
index 17c3e0987e..4299a38ee0 100644
--- a/src/buntime/bindings/DeferredError.zig
+++ b/src/buntime/api/error/DeferredError.zig
@@ -27,7 +27,7 @@ pub const DeferredError = struct {
 };
 
 const bun = @import("bun");
-const ZigString = @import("./ZigString.zig").ZigString;
+const ZigString = @import("../../bindings/ZigString.zig").ZigString;
 
 const jsc = bun.jsc;
 const JSGlobalObject = jsc.JSGlobalObject;
diff --git a/src/buntime/bindings/ErrorCode.cpp b/src/buntime/api/error/ErrorCode.cpp
similarity index 100%
rename from src/buntime/bindings/ErrorCode.cpp
rename to src/buntime/api/error/ErrorCode.cpp
diff --git a/src/buntime/bindings/ErrorCode.h b/src/buntime/api/error/ErrorCode.h
similarity index 100%
rename from src/buntime/bindings/ErrorCode.h
rename to src/buntime/api/error/ErrorCode.h
diff --git a/src/buntime/bindings/ErrorCode.ts b/src/buntime/api/error/ErrorCode.ts
similarity index 100%
rename from src/buntime/bindings/ErrorCode.ts
rename to src/buntime/api/error/ErrorCode.ts
diff --git a/src/buntime/bindings/ErrorCode.zig b/src/buntime/api/error/ErrorCode.zig
similarity index 100%
rename from src/buntime/bindings/ErrorCode.zig
rename to src/buntime/api/error/ErrorCode.zig
diff --git a/src/buntime/bindings/ErrorStackFrame.cpp b/src/buntime/api/error/ErrorStackFrame.cpp
similarity index 100%
rename from src/buntime/bindings/ErrorStackFrame.cpp
rename to src/buntime/api/error/ErrorStackFrame.cpp
diff --git a/src/buntime/bindings/ErrorStackFrame.h b/src/buntime/api/error/ErrorStackFrame.h
similarity index 100%
rename from src/buntime/bindings/ErrorStackFrame.h
rename to src/buntime/api/error/ErrorStackFrame.h
diff --git a/src/buntime/bindings/ErrorStackTrace.cpp b/src/buntime/api/error/ErrorStackTrace.cpp
similarity index 100%
rename from src/buntime/bindings/ErrorStackTrace.cpp
rename to src/buntime/api/error/ErrorStackTrace.cpp
diff --git a/src/buntime/bindings/ErrorStackTrace.h b/src/buntime/api/error/ErrorStackTrace.h
similarity index 100%
rename from src/buntime/bindings/ErrorStackTrace.h
rename to src/buntime/api/error/ErrorStackTrace.h
diff --git a/src/buntime/bindings/Errorable.zig b/src/buntime/api/error/Errorable.zig
similarity index 100%
rename from src/buntime/bindings/Errorable.zig
rename to src/buntime/api/error/Errorable.zig
diff --git a/src/buntime/bindings/JSErrorCode.zig b/src/buntime/api/error/JSErrorCode.zig
similarity index 100%
rename from src/buntime/bindings/JSErrorCode.zig
rename to src/buntime/api/error/JSErrorCode.zig
diff --git a/src/buntime/bindings/SystemError.zig b/src/buntime/api/error/SystemError.zig
similarity index 100%
rename from src/buntime/bindings/SystemError.zig
rename to src/buntime/api/error/SystemError.zig
diff --git a/src/buntime/bindings/ZigErrorType.zig b/src/buntime/api/error/ZigErrorType.zig
similarity index 100%
rename from src/buntime/bindings/ZigErrorType.zig
rename to src/buntime/api/error/ZigErrorType.zig
diff --git a/src/buntime/bindings/webcore/JSCustomEvent.cpp b/src/buntime/bindings/webcore/JSCustomEvent.cpp
index bff23a2b3a..91ae85fa60 100644
--- a/src/buntime/bindings/webcore/JSCustomEvent.cpp
+++ b/src/buntime/bindings/webcore/JSCustomEvent.cpp
@@ -47,7 +47,7 @@
 #include <wtf/GetPtr.h>
 #include <wtf/PointerPreparations.h>
 #include <wtf/URL.h>
-#include "../ErrorCode.h"
+#include "ErrorCode.h"
 
 namespace WebCore {
 using namespace JSC;
diff --git a/src/buntime/bindings/webcore/JSEventTargetNode.cpp b/src/buntime/bindings/webcore/JSEventTargetNode.cpp
index fa4c3159c3..357a6f3dcd 100644
--- a/src/buntime/bindings/webcore/JSEventTargetNode.cpp
+++ b/src/buntime/bindings/webcore/JSEventTargetNode.cpp
@@ -8,7 +8,7 @@
 #include "JSEventTarget.h"
 #include "JavaScriptCore/JSArray.h"
 #include "wtf/text/MakeString.h"
-#include "../ErrorCode.h"
+#include "ErrorCode.h"
 
 namespace Bun {
 
diff --git a/src/buntime/jsc.zig b/src/buntime/jsc.zig
index c1c4660e3f..d72eeb7724 100644
--- a/src/buntime/jsc.zig
+++ b/src/buntime/jsc.zig
@@ -52,7 +52,7 @@ pub const CustomGetterSetter = @import("./bindings/CustomGetterSetter.zig").Cust
 pub const DOMFormData = @import("./bindings/DOMFormData.zig").DOMFormData;
 pub const DOMURL = @import("./bindings/DOMURL.zig").DOMURL;
 pub const DecodedJSValue = @import("./bindings/DecodedJSValue.zig").DecodedJSValue;
-pub const DeferredError = @import("./bindings/DeferredError.zig").DeferredError;
+pub const DeferredError = @import("./api/error/DeferredError.zig").DeferredError;
 pub const GetterSetter = @import("./bindings/GetterSetter.zig").GetterSetter;
 pub const JSArray = @import("./bindings/JSArray.zig").JSArray;
 pub const JSArrayIterator = @import("./bindings/JSArrayIterator.zig").JSArrayIterator;
@@ -73,7 +73,7 @@ pub const RefString = @import("./jsc/RefString.zig");
 pub const ScriptExecutionStatus = @import("./bindings/ScriptExecutionStatus.zig").ScriptExecutionStatus;
 pub const SourceType = @import("./bindings/SourceType.zig").SourceType;
 pub const Strong = @import("./Strong.zig");
-pub const SystemError = @import("./bindings/SystemError.zig").SystemError;
+pub const SystemError = @import("./api/error/SystemError.zig").SystemError;
 pub const URL = @import("./bindings/URL.zig").URL;
 pub const URLSearchParams = @import("./bindings/URLSearchParams.zig").URLSearchParams;
 pub const VM = @import("./bindings/VM.zig").VM;
@@ -87,11 +87,11 @@ pub const MarkedArgumentBuffer = @import("./bindings/MarkedArgumentBuffer.zig").
 pub const RegularExpression = @import("./bindings/RegularExpression.zig").RegularExpression;
 
 // JavaScript-related
-pub const Errorable = @import("./bindings/Errorable.zig").Errorable;
+pub const Errorable = @import("./api/error/Errorable.zig").Errorable;
 pub const ResolvedSource = @import("./bindings/ResolvedSource.zig").ResolvedSource;
-pub const ErrorCode = @import("./bindings/ErrorCode.zig").ErrorCode;
-pub const JSErrorCode = @import("./bindings/JSErrorCode.zig").JSErrorCode;
-pub const ZigErrorType = @import("./bindings/ZigErrorType.zig").ZigErrorType;
+pub const ErrorCode = @import("./api/error/ErrorCode.zig").ErrorCode;
+pub const JSErrorCode = @import("./api/error/JSErrorCode.zig").JSErrorCode;
+pub const ZigErrorType = @import("./api/error/ZigErrorType.zig").ZigErrorType;
 pub const Debugger = @import("./Debugger.zig");
 pub const SavedSourceMap = @import("./SavedSourceMap.zig");
 pub const VirtualMachine = @import("./VirtualMachine.zig");
diff --git a/src/buntime/webcore.zig b/src/buntime/webcore.zig
index 8dbf4a02e4..ba359e9786 100644
--- a/src/buntime/webcore.zig
+++ b/src/buntime/webcore.zig
@@ -7,7 +7,7 @@ comptime {
     _ = &@import("./webcore/TextEncoder.zig");
 }
 
-pub const DOMExceptionCode = @import("./bindings/JSErrorCode.zig").DOMExceptionCode;
+pub const DOMExceptionCode = @import("./api/error/JSErrorCode.zig").DOMExceptionCode;
 
 // TODO: make this JSGlobalObject local for better security
 pub const ByteListPool = bun.ObjectPool(bun.ByteList, null, true, 8);