diff --git a/cmake/Sources.json b/cmake/Sources.json
index fb2b85c25d..75be12cf79 100644
--- a/cmake/Sources.json
+++ b/cmake/Sources.json
@@ -58,6 +58,7 @@
       "src/buntime/api/console/*.cpp",
       "src/buntime/api/inspector/*.cpp",
       "src/buntime/api/error/*.cpp",
+      "src/buntime/api/cookie/*.cpp",
       "src/bake/*.cpp",
       "src/deps/*.cpp",
       "src/vm/*.cpp",
diff --git a/cmake/targets/BuildBun.cmake b/cmake/targets/BuildBun.cmake
index 1ef6978f20..7e998e82b3 100644
--- a/cmake/targets/BuildBun.cmake
+++ b/cmake/targets/BuildBun.cmake
@@ -225,8 +225,11 @@ set(BUN_ERROR_CODE_SCRIPT ${CWD}/src/codegen/generate-node-errors.ts)
 
 set(BUN_ERROR_CODE_SOURCES
   ${BUN_ERROR_CODE_SCRIPT}
+  ${CWD}/src/buntime/api/error
   ${CWD}/src/buntime/api/error/ErrorCode.ts
+  ${CWD}/src/buntime/api/error
   ${CWD}/src/buntime/api/error/ErrorCode.cpp
+  ${CWD}/src/buntime/api/error
   ${CWD}/src/buntime/api/error/ErrorCode.h
 )
 
@@ -591,11 +594,13 @@ foreach(i RANGE 0 ${BUN_OBJECT_LUT_SOURCES_MAX_INDEX})
 endforeach()
 
 WEBKIT_ADD_SOURCE_DEPENDENCIES(
+  ${CWD}/src/buntime/api/error
   ${CWD}/src/buntime/api/error/ErrorCode.cpp
   ${CODEGEN_PATH}/ErrorCode+List.h
 )
 
 WEBKIT_ADD_SOURCE_DEPENDENCIES(
+  ${CWD}/src/buntime/api/error
   ${CWD}/src/buntime/api/error/ErrorCode.h
   ${CODEGEN_PATH}/ErrorCode+Data.h
 )
@@ -868,6 +873,7 @@ target_include_directories(${bun} PRIVATE
   ${CWD}/src/buntime/api/console
   ${CWD}/src/buntime/api/inspector
   ${CWD}/src/buntime/api/error
+  ${CWD}/src/buntime/api/cookie
   ${CWD}/src/buntime/modules
   ${CWD}/src/js/builtins
   ${CWD}/src/napi
diff --git a/src/buntime/bindings/webcore/JSCookie.cpp b/src/buntime/api/cookie/JSCookie.cpp
similarity index 100%
rename from src/buntime/bindings/webcore/JSCookie.cpp
rename to src/buntime/api/cookie/JSCookie.cpp
diff --git a/src/buntime/bindings/webcore/JSCookie.h b/src/buntime/api/cookie/JSCookie.h
similarity index 100%
rename from src/buntime/bindings/webcore/JSCookie.h
rename to src/buntime/api/cookie/JSCookie.h
diff --git a/src/buntime/bindings/webcore/JSCookieMap.cpp b/src/buntime/api/cookie/JSCookieMap.cpp
similarity index 100%
rename from src/buntime/bindings/webcore/JSCookieMap.cpp
rename to src/buntime/api/cookie/JSCookieMap.cpp
diff --git a/src/buntime/bindings/webcore/JSCookieMap.h b/src/buntime/api/cookie/JSCookieMap.h
similarity index 100%
rename from src/buntime/bindings/webcore/JSCookieMap.h
rename to src/buntime/api/cookie/JSCookieMap.h
diff --git a/src/codegen/generate-node-errors.ts b/src/codegen/generate-node-errors.ts
index d26611eef7..958c70d4c4 100644
--- a/src/codegen/generate-node-errors.ts
+++ b/src/codegen/generate-node-errors.ts
@@ -1,5 +1,5 @@
 import path from "node:path";
-import NodeErrors from "../buntime/bindings/ErrorCode.ts";
+import NodeErrors from "../buntime/api/error/ErrorCode.ts";
 import { writeIfNotChanged } from "./helpers.ts";
 const outputDir = process.argv[2];
 
@@ -24,7 +24,7 @@ let zig = ``;
 enumHeader = `
 // clang-format off
 // Generated by: src/codegen/generate-node-errors.ts
-// Input:        src/buntime/bindings/ErrorCode.ts
+// Input:        src/buntime/api/error/ErrorCode.ts
 #pragma once
 
 #include <cstdint>
@@ -149,7 +149,7 @@ let builtindts = await Bun.file(builtindtsPath).text();
 
 let dts = `
 // Generated by: src/codegen/generate-node-errors.ts
-// Input:        src/buntime/bindings/ErrorCode.ts
+// Input:        src/buntime/api/error/ErrorCode.ts
 
 // Global error code functions for TypeScript
 `;
diff --git a/src/codegen/replacements.ts b/src/codegen/replacements.ts
index c44a2487b6..7331d2228f 100644
--- a/src/codegen/replacements.ts
+++ b/src/codegen/replacements.ts
@@ -1,5 +1,5 @@
 import { LoaderKeys } from "../api/schema";
-import NodeErrors from "../buntime/bindings/ErrorCode.ts";
+import NodeErrors from "../buntime/api/error/ErrorCode.ts";
 import jsclasses from "./../buntime/bindings/js_classes";
 import { sliceSourceCode } from "./builtin-parser";
 import { registerNativeCall } from "./generate-js2native";