From cf86901409458d4d1670c6ea224ebbd62902016a Mon Sep 17 00:00:00 2001
From: Claude Bot <claude-bot@bun.sh>
Date: Tue, 30 Dec 2025 05:01:35 +0000
Subject: [PATCH] refactor: move event-related files to web/events/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move Event*, MessagePort*, BroadcastChannel*, AbortSignal,
EventTarget, EventEmitter, JS* event files from bindings/
and webcore/ to web/events/.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 cmake/Sources.json                                            | 1 +
 cmake/targets/BuildBun.cmake                                  | 1 +
 src/buntime/jsc.zig                                           | 4 ++--
 src/buntime/{bindings => web/events}/AbortSignal.zig          | 0
 src/buntime/{webcore => web/events}/AddEventListenerOptions.h | 0
 src/buntime/{webcore => web/events}/BroadcastChannel.cpp      | 0
 src/buntime/{webcore => web/events}/BroadcastChannel.h        | 0
 .../{webcore => web/events}/BroadcastChannelIdentifier.h      | 0
 .../{webcore => web/events}/BroadcastChannelRegistry.h        | 0
 .../{webcore => web/events}/BunBroadcastChannelRegistry.cpp   | 0
 .../{webcore => web/events}/BunBroadcastChannelRegistry.h     | 0
 src/buntime/{webcore => web/events}/CloseEvent.cpp            | 0
 src/buntime/{webcore => web/events}/CloseEvent.h              | 0
 src/buntime/{webcore => web/events}/CloseEvent.idl            | 0
 src/buntime/{bindings => web/events}/CommonAbortReason.zig    | 0
 src/buntime/{webcore => web/events}/CustomEvent.cpp           | 0
 src/buntime/{webcore => web/events}/CustomEvent.h             | 0
 src/buntime/{webcore => web/events}/CustomEvent.idl           | 0
 src/buntime/{webcore => web/events}/CustomEventCustom.cpp     | 0
 src/buntime/{webcore => web/events}/ErrorEvent.cpp            | 0
 src/buntime/{webcore => web/events}/ErrorEvent.h              | 0
 src/buntime/{webcore => web/events}/ErrorEvent.idl            | 0
 src/buntime/{webcore => web/events}/Event.cpp                 | 0
 src/buntime/{webcore => web/events}/Event.h                   | 0
 src/buntime/{webcore => web/events}/Event.idl                 | 0
 src/buntime/{webcore => web/events}/EventContext.cpp          | 0
 src/buntime/{webcore => web/events}/EventContext.h            | 0
 src/buntime/{webcore => web/events}/EventDispatcher.cpp       | 0
 src/buntime/{webcore => web/events}/EventDispatcher.h         | 0
 src/buntime/{webcore => web/events}/EventEmitter.cpp          | 0
 src/buntime/{webcore => web/events}/EventEmitter.h            | 0
 src/buntime/{webcore => web/events}/EventFactory.cpp          | 0
 src/buntime/{webcore => web/events}/EventHeaders.h            | 0
 src/buntime/{webcore => web/events}/EventInit.h               | 0
 src/buntime/{webcore => web/events}/EventInit.idl             | 0
 src/buntime/{webcore => web/events}/EventInterfaces.h         | 0
 src/buntime/{webcore => web/events}/EventListener.h           | 0
 src/buntime/{webcore => web/events}/EventListener.idl         | 0
 src/buntime/{webcore => web/events}/EventListenerMap.cpp      | 0
 src/buntime/{webcore => web/events}/EventListenerMap.h        | 0
 src/buntime/{webcore => web/events}/EventListenerOptions.h    | 0
 src/buntime/{webcore => web/events}/EventListenerOptions.idl  | 0
 src/buntime/{webcore => web/events}/EventModifierInit.h       | 0
 src/buntime/{webcore => web/events}/EventNames.cpp            | 0
 src/buntime/{webcore => web/events}/EventNames.h              | 0
 src/buntime/{webcore => web/events}/EventNames.in             | 0
 src/buntime/{webcore => web/events}/EventOptions.h            | 0
 src/buntime/{webcore => web/events}/EventPath.cpp             | 0
 src/buntime/{webcore => web/events}/EventPath.h               | 0
 src/buntime/{webcore => web/events}/EventSender.h             | 0
 src/buntime/{webcore => web/events}/EventTarget.cpp           | 0
 src/buntime/{webcore => web/events}/EventTarget.h             | 0
 src/buntime/{webcore => web/events}/EventTarget.idl           | 0
 src/buntime/{webcore => web/events}/EventTargetConcrete.cpp   | 0
 src/buntime/{webcore => web/events}/EventTargetConcrete.h     | 0
 src/buntime/{webcore => web/events}/EventTargetFactory.cpp    | 0
 src/buntime/{webcore => web/events}/EventTargetHeaders.h      | 0
 src/buntime/{webcore => web/events}/EventTargetInterfaces.h   | 0
 src/buntime/{bindings => web/events}/EventType.zig            | 0
 .../{webcore => web/events}/IdentifierEventListenerMap.cpp    | 0
 .../{webcore => web/events}/IdentifierEventListenerMap.h      | 0
 .../{webcore => web/events}/JSAddEventListenerOptions.cpp     | 0
 .../{webcore => web/events}/JSAddEventListenerOptions.h       | 0
 src/buntime/{webcore => web/events}/JSBroadcastChannel.cpp    | 0
 src/buntime/{webcore => web/events}/JSBroadcastChannel.h      | 0
 src/buntime/{webcore => web/events}/JSCloseEvent.cpp          | 0
 src/buntime/{webcore => web/events}/JSCloseEvent.h            | 0
 src/buntime/{webcore => web/events}/JSCustomEvent.cpp         | 0
 src/buntime/{webcore => web/events}/JSCustomEvent.h           | 0
 .../{webcore => web/events}/JSDOMConvertEventListener.h       | 0
 src/buntime/{webcore => web/events}/JSErrorEvent.cpp          | 0
 src/buntime/{webcore => web/events}/JSErrorEvent.h            | 0
 src/buntime/{webcore => web/events}/JSErrorEventCustom.cpp    | 0
 src/buntime/{webcore => web/events}/JSEvent.cpp               | 0
 src/buntime/{webcore => web/events}/JSEvent.h                 | 0
 src/buntime/{webcore => web/events}/JSEventCustom.cpp         | 0
 src/buntime/{webcore => web/events}/JSEventCustom.h           | 0
 src/buntime/{webcore => web/events}/JSEventDOMJIT.cpp         | 0
 src/buntime/{webcore => web/events}/JSEventEmitter.cpp        | 0
 src/buntime/{webcore => web/events}/JSEventEmitter.h          | 0
 src/buntime/{webcore => web/events}/JSEventEmitterCustom.cpp  | 0
 src/buntime/{webcore => web/events}/JSEventEmitterCustom.h    | 0
 src/buntime/{webcore => web/events}/JSEventInit.cpp           | 0
 src/buntime/{webcore => web/events}/JSEventInit.h             | 0
 src/buntime/{webcore => web/events}/JSEventListener.cpp       | 0
 src/buntime/{webcore => web/events}/JSEventListener.h         | 0
 .../{webcore => web/events}/JSEventListenerOptions.cpp        | 0
 src/buntime/{webcore => web/events}/JSEventListenerOptions.h  | 0
 src/buntime/{webcore => web/events}/JSEventModifierInit.cpp   | 0
 src/buntime/{webcore => web/events}/JSEventModifierInit.h     | 0
 src/buntime/{webcore => web/events}/JSEventTarget.cpp         | 0
 src/buntime/{webcore => web/events}/JSEventTarget.h           | 0
 src/buntime/{webcore => web/events}/JSEventTargetCustom.cpp   | 0
 src/buntime/{webcore => web/events}/JSEventTargetCustom.h     | 0
 src/buntime/{webcore => web/events}/JSEventTargetNode.cpp     | 0
 src/buntime/{webcore => web/events}/JSEventTargetNode.h       | 0
 src/buntime/{webcore => web/events}/JSMessageEvent.cpp        | 0
 src/buntime/{webcore => web/events}/JSMessageEvent.h          | 0
 src/buntime/{webcore => web/events}/JSMessageEventCustom.cpp  | 0
 src/buntime/{webcore => web/events}/JSMessagePort.cpp         | 0
 src/buntime/{webcore => web/events}/JSMessagePort.h           | 0
 src/buntime/{webcore => web/events}/JSMessagePortCustom.cpp   | 0
 src/buntime/{webcore => web/events}/MessageEvent.cpp          | 0
 src/buntime/{webcore => web/events}/MessageEvent.h            | 0
 src/buntime/{webcore => web/events}/MessageEvent.idl          | 0
 src/buntime/{webcore => web/events}/MessagePort.cpp           | 0
 src/buntime/{webcore => web/events}/MessagePort.h             | 0
 src/buntime/{webcore => web/events}/MessagePortChannel.cpp    | 0
 src/buntime/{webcore => web/events}/MessagePortChannel.h      | 0
 .../{webcore => web/events}/MessagePortChannelProvider.cpp    | 0
 .../{webcore => web/events}/MessagePortChannelProvider.h      | 0
 .../events}/MessagePortChannelProviderImpl.cpp                | 0
 .../{webcore => web/events}/MessagePortChannelProviderImpl.h  | 0
 .../{webcore => web/events}/MessagePortChannelRegistry.cpp    | 0
 .../{webcore => web/events}/MessagePortChannelRegistry.h      | 0
 src/buntime/{webcore => web/events}/MessagePortIdentifier.h   | 0
 src/buntime/{webcore => web/events}/MessageWithMessagePorts.h | 0
 src/buntime/{webcore => web/events}/RegisteredEventListener.h | 0
 src/buntime/{webcore => web/events}/TransferredMessagePort.h  | 0
 src/buntime/{webcore => web/events}/UIEventInit.h             | 0
 src/buntime/webcore.zig                                       | 2 +-
 121 files changed, 5 insertions(+), 3 deletions(-)
 rename src/buntime/{bindings => web/events}/AbortSignal.zig (100%)
 rename src/buntime/{webcore => web/events}/AddEventListenerOptions.h (100%)
 rename src/buntime/{webcore => web/events}/BroadcastChannel.cpp (100%)
 rename src/buntime/{webcore => web/events}/BroadcastChannel.h (100%)
 rename src/buntime/{webcore => web/events}/BroadcastChannelIdentifier.h (100%)
 rename src/buntime/{webcore => web/events}/BroadcastChannelRegistry.h (100%)
 rename src/buntime/{webcore => web/events}/BunBroadcastChannelRegistry.cpp (100%)
 rename src/buntime/{webcore => web/events}/BunBroadcastChannelRegistry.h (100%)
 rename src/buntime/{webcore => web/events}/CloseEvent.cpp (100%)
 rename src/buntime/{webcore => web/events}/CloseEvent.h (100%)
 rename src/buntime/{webcore => web/events}/CloseEvent.idl (100%)
 rename src/buntime/{bindings => web/events}/CommonAbortReason.zig (100%)
 rename src/buntime/{webcore => web/events}/CustomEvent.cpp (100%)
 rename src/buntime/{webcore => web/events}/CustomEvent.h (100%)
 rename src/buntime/{webcore => web/events}/CustomEvent.idl (100%)
 rename src/buntime/{webcore => web/events}/CustomEventCustom.cpp (100%)
 rename src/buntime/{webcore => web/events}/ErrorEvent.cpp (100%)
 rename src/buntime/{webcore => web/events}/ErrorEvent.h (100%)
 rename src/buntime/{webcore => web/events}/ErrorEvent.idl (100%)
 rename src/buntime/{webcore => web/events}/Event.cpp (100%)
 rename src/buntime/{webcore => web/events}/Event.h (100%)
 rename src/buntime/{webcore => web/events}/Event.idl (100%)
 rename src/buntime/{webcore => web/events}/EventContext.cpp (100%)
 rename src/buntime/{webcore => web/events}/EventContext.h (100%)
 rename src/buntime/{webcore => web/events}/EventDispatcher.cpp (100%)
 rename src/buntime/{webcore => web/events}/EventDispatcher.h (100%)
 rename src/buntime/{webcore => web/events}/EventEmitter.cpp (100%)
 rename src/buntime/{webcore => web/events}/EventEmitter.h (100%)
 rename src/buntime/{webcore => web/events}/EventFactory.cpp (100%)
 rename src/buntime/{webcore => web/events}/EventHeaders.h (100%)
 rename src/buntime/{webcore => web/events}/EventInit.h (100%)
 rename src/buntime/{webcore => web/events}/EventInit.idl (100%)
 rename src/buntime/{webcore => web/events}/EventInterfaces.h (100%)
 rename src/buntime/{webcore => web/events}/EventListener.h (100%)
 rename src/buntime/{webcore => web/events}/EventListener.idl (100%)
 rename src/buntime/{webcore => web/events}/EventListenerMap.cpp (100%)
 rename src/buntime/{webcore => web/events}/EventListenerMap.h (100%)
 rename src/buntime/{webcore => web/events}/EventListenerOptions.h (100%)
 rename src/buntime/{webcore => web/events}/EventListenerOptions.idl (100%)
 rename src/buntime/{webcore => web/events}/EventModifierInit.h (100%)
 rename src/buntime/{webcore => web/events}/EventNames.cpp (100%)
 rename src/buntime/{webcore => web/events}/EventNames.h (100%)
 rename src/buntime/{webcore => web/events}/EventNames.in (100%)
 rename src/buntime/{webcore => web/events}/EventOptions.h (100%)
 rename src/buntime/{webcore => web/events}/EventPath.cpp (100%)
 rename src/buntime/{webcore => web/events}/EventPath.h (100%)
 rename src/buntime/{webcore => web/events}/EventSender.h (100%)
 rename src/buntime/{webcore => web/events}/EventTarget.cpp (100%)
 rename src/buntime/{webcore => web/events}/EventTarget.h (100%)
 rename src/buntime/{webcore => web/events}/EventTarget.idl (100%)
 rename src/buntime/{webcore => web/events}/EventTargetConcrete.cpp (100%)
 rename src/buntime/{webcore => web/events}/EventTargetConcrete.h (100%)
 rename src/buntime/{webcore => web/events}/EventTargetFactory.cpp (100%)
 rename src/buntime/{webcore => web/events}/EventTargetHeaders.h (100%)
 rename src/buntime/{webcore => web/events}/EventTargetInterfaces.h (100%)
 rename src/buntime/{bindings => web/events}/EventType.zig (100%)
 rename src/buntime/{webcore => web/events}/IdentifierEventListenerMap.cpp (100%)
 rename src/buntime/{webcore => web/events}/IdentifierEventListenerMap.h (100%)
 rename src/buntime/{webcore => web/events}/JSAddEventListenerOptions.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSAddEventListenerOptions.h (100%)
 rename src/buntime/{webcore => web/events}/JSBroadcastChannel.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSBroadcastChannel.h (100%)
 rename src/buntime/{webcore => web/events}/JSCloseEvent.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSCloseEvent.h (100%)
 rename src/buntime/{webcore => web/events}/JSCustomEvent.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSCustomEvent.h (100%)
 rename src/buntime/{webcore => web/events}/JSDOMConvertEventListener.h (100%)
 rename src/buntime/{webcore => web/events}/JSErrorEvent.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSErrorEvent.h (100%)
 rename src/buntime/{webcore => web/events}/JSErrorEventCustom.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSEvent.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSEvent.h (100%)
 rename src/buntime/{webcore => web/events}/JSEventCustom.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSEventCustom.h (100%)
 rename src/buntime/{webcore => web/events}/JSEventDOMJIT.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSEventEmitter.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSEventEmitter.h (100%)
 rename src/buntime/{webcore => web/events}/JSEventEmitterCustom.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSEventEmitterCustom.h (100%)
 rename src/buntime/{webcore => web/events}/JSEventInit.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSEventInit.h (100%)
 rename src/buntime/{webcore => web/events}/JSEventListener.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSEventListener.h (100%)
 rename src/buntime/{webcore => web/events}/JSEventListenerOptions.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSEventListenerOptions.h (100%)
 rename src/buntime/{webcore => web/events}/JSEventModifierInit.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSEventModifierInit.h (100%)
 rename src/buntime/{webcore => web/events}/JSEventTarget.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSEventTarget.h (100%)
 rename src/buntime/{webcore => web/events}/JSEventTargetCustom.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSEventTargetCustom.h (100%)
 rename src/buntime/{webcore => web/events}/JSEventTargetNode.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSEventTargetNode.h (100%)
 rename src/buntime/{webcore => web/events}/JSMessageEvent.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSMessageEvent.h (100%)
 rename src/buntime/{webcore => web/events}/JSMessageEventCustom.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSMessagePort.cpp (100%)
 rename src/buntime/{webcore => web/events}/JSMessagePort.h (100%)
 rename src/buntime/{webcore => web/events}/JSMessagePortCustom.cpp (100%)
 rename src/buntime/{webcore => web/events}/MessageEvent.cpp (100%)
 rename src/buntime/{webcore => web/events}/MessageEvent.h (100%)
 rename src/buntime/{webcore => web/events}/MessageEvent.idl (100%)
 rename src/buntime/{webcore => web/events}/MessagePort.cpp (100%)
 rename src/buntime/{webcore => web/events}/MessagePort.h (100%)
 rename src/buntime/{webcore => web/events}/MessagePortChannel.cpp (100%)
 rename src/buntime/{webcore => web/events}/MessagePortChannel.h (100%)
 rename src/buntime/{webcore => web/events}/MessagePortChannelProvider.cpp (100%)
 rename src/buntime/{webcore => web/events}/MessagePortChannelProvider.h (100%)
 rename src/buntime/{webcore => web/events}/MessagePortChannelProviderImpl.cpp (100%)
 rename src/buntime/{webcore => web/events}/MessagePortChannelProviderImpl.h (100%)
 rename src/buntime/{webcore => web/events}/MessagePortChannelRegistry.cpp (100%)
 rename src/buntime/{webcore => web/events}/MessagePortChannelRegistry.h (100%)
 rename src/buntime/{webcore => web/events}/MessagePortIdentifier.h (100%)
 rename src/buntime/{webcore => web/events}/MessageWithMessagePorts.h (100%)
 rename src/buntime/{webcore => web/events}/RegisteredEventListener.h (100%)
 rename src/buntime/{webcore => web/events}/TransferredMessagePort.h (100%)
 rename src/buntime/{webcore => web/events}/UIEventInit.h (100%)

diff --git a/cmake/Sources.json b/cmake/Sources.json
index ff631fadbb..3bae722338 100644
--- a/cmake/Sources.json
+++ b/cmake/Sources.json
@@ -83,6 +83,7 @@
       "src/buntime/web/blob/*.cpp",
       "src/buntime/web/encoding/*.cpp",
       "src/buntime/web/compression/*.cpp",
+      "src/buntime/web/events/*.cpp",
       "src/bake/*.cpp",
       "src/deps/*.cpp",
       "src/vm/*.cpp",
diff --git a/cmake/targets/BuildBun.cmake b/cmake/targets/BuildBun.cmake
index ccf1cc9a8e..839a5c9e60 100644
--- a/cmake/targets/BuildBun.cmake
+++ b/cmake/targets/BuildBun.cmake
@@ -894,6 +894,7 @@ target_include_directories(${bun} PRIVATE
   ${CWD}/src/buntime/web/blob
   ${CWD}/src/buntime/web/encoding
   ${CWD}/src/buntime/web/compression
+  ${CWD}/src/buntime/web/events
   ${CWD}/src/buntime/modules
   ${CWD}/src/js/builtins
   ${CWD}/src/napi
diff --git a/src/buntime/jsc.zig b/src/buntime/jsc.zig
index 390700ead8..15a81a5d8a 100644
--- a/src/buntime/jsc.zig
+++ b/src/buntime/jsc.zig
@@ -46,7 +46,7 @@ pub const MarkedArrayBuffer = array_buffer.MarkedArrayBuffer;
 pub const JSCArrayBuffer = array_buffer.JSCArrayBuffer;
 pub const CachedBytecode = @import("./bindings/CachedBytecode.zig").CachedBytecode;
 pub const CallFrame = @import("./bindings/CallFrame.zig").CallFrame;
-pub const CommonAbortReason = @import("./bindings/CommonAbortReason.zig").CommonAbortReason;
+pub const CommonAbortReason = @import("./web/events/CommonAbortReason.zig").CommonAbortReason;
 pub const CommonStrings = @import("./bindings/CommonStrings.zig").CommonStrings;
 pub const CustomGetterSetter = @import("./bindings/CustomGetterSetter.zig").CustomGetterSetter;
 pub const DOMFormData = @import("./web/blob/DOMFormData.zig").DOMFormData;
@@ -97,7 +97,7 @@ pub const SavedSourceMap = @import("./SavedSourceMap.zig");
 pub const VirtualMachine = @import("./VirtualMachine.zig");
 pub const ModuleLoader = @import("./ModuleLoader.zig");
 pub const RareData = @import("./rare_data.zig");
-pub const EventType = @import("./bindings/EventType.zig").EventType;
+pub const EventType = @import("./web/events/EventType.zig").EventType;
 pub const JSRuntimeType = @import("./bindings/JSRuntimeType.zig").JSRuntimeType;
 pub const ZigStackFrameCode = @import("./bindings/ZigStackFrameCode.zig").ZigStackFrameCode;
 
diff --git a/src/buntime/bindings/AbortSignal.zig b/src/buntime/web/events/AbortSignal.zig
similarity index 100%
rename from src/buntime/bindings/AbortSignal.zig
rename to src/buntime/web/events/AbortSignal.zig
diff --git a/src/buntime/webcore/AddEventListenerOptions.h b/src/buntime/web/events/AddEventListenerOptions.h
similarity index 100%
rename from src/buntime/webcore/AddEventListenerOptions.h
rename to src/buntime/web/events/AddEventListenerOptions.h
diff --git a/src/buntime/webcore/BroadcastChannel.cpp b/src/buntime/web/events/BroadcastChannel.cpp
similarity index 100%
rename from src/buntime/webcore/BroadcastChannel.cpp
rename to src/buntime/web/events/BroadcastChannel.cpp
diff --git a/src/buntime/webcore/BroadcastChannel.h b/src/buntime/web/events/BroadcastChannel.h
similarity index 100%
rename from src/buntime/webcore/BroadcastChannel.h
rename to src/buntime/web/events/BroadcastChannel.h
diff --git a/src/buntime/webcore/BroadcastChannelIdentifier.h b/src/buntime/web/events/BroadcastChannelIdentifier.h
similarity index 100%
rename from src/buntime/webcore/BroadcastChannelIdentifier.h
rename to src/buntime/web/events/BroadcastChannelIdentifier.h
diff --git a/src/buntime/webcore/BroadcastChannelRegistry.h b/src/buntime/web/events/BroadcastChannelRegistry.h
similarity index 100%
rename from src/buntime/webcore/BroadcastChannelRegistry.h
rename to src/buntime/web/events/BroadcastChannelRegistry.h
diff --git a/src/buntime/webcore/BunBroadcastChannelRegistry.cpp b/src/buntime/web/events/BunBroadcastChannelRegistry.cpp
similarity index 100%
rename from src/buntime/webcore/BunBroadcastChannelRegistry.cpp
rename to src/buntime/web/events/BunBroadcastChannelRegistry.cpp
diff --git a/src/buntime/webcore/BunBroadcastChannelRegistry.h b/src/buntime/web/events/BunBroadcastChannelRegistry.h
similarity index 100%
rename from src/buntime/webcore/BunBroadcastChannelRegistry.h
rename to src/buntime/web/events/BunBroadcastChannelRegistry.h
diff --git a/src/buntime/webcore/CloseEvent.cpp b/src/buntime/web/events/CloseEvent.cpp
similarity index 100%
rename from src/buntime/webcore/CloseEvent.cpp
rename to src/buntime/web/events/CloseEvent.cpp
diff --git a/src/buntime/webcore/CloseEvent.h b/src/buntime/web/events/CloseEvent.h
similarity index 100%
rename from src/buntime/webcore/CloseEvent.h
rename to src/buntime/web/events/CloseEvent.h
diff --git a/src/buntime/webcore/CloseEvent.idl b/src/buntime/web/events/CloseEvent.idl
similarity index 100%
rename from src/buntime/webcore/CloseEvent.idl
rename to src/buntime/web/events/CloseEvent.idl
diff --git a/src/buntime/bindings/CommonAbortReason.zig b/src/buntime/web/events/CommonAbortReason.zig
similarity index 100%
rename from src/buntime/bindings/CommonAbortReason.zig
rename to src/buntime/web/events/CommonAbortReason.zig
diff --git a/src/buntime/webcore/CustomEvent.cpp b/src/buntime/web/events/CustomEvent.cpp
similarity index 100%
rename from src/buntime/webcore/CustomEvent.cpp
rename to src/buntime/web/events/CustomEvent.cpp
diff --git a/src/buntime/webcore/CustomEvent.h b/src/buntime/web/events/CustomEvent.h
similarity index 100%
rename from src/buntime/webcore/CustomEvent.h
rename to src/buntime/web/events/CustomEvent.h
diff --git a/src/buntime/webcore/CustomEvent.idl b/src/buntime/web/events/CustomEvent.idl
similarity index 100%
rename from src/buntime/webcore/CustomEvent.idl
rename to src/buntime/web/events/CustomEvent.idl
diff --git a/src/buntime/webcore/CustomEventCustom.cpp b/src/buntime/web/events/CustomEventCustom.cpp
similarity index 100%
rename from src/buntime/webcore/CustomEventCustom.cpp
rename to src/buntime/web/events/CustomEventCustom.cpp
diff --git a/src/buntime/webcore/ErrorEvent.cpp b/src/buntime/web/events/ErrorEvent.cpp
similarity index 100%
rename from src/buntime/webcore/ErrorEvent.cpp
rename to src/buntime/web/events/ErrorEvent.cpp
diff --git a/src/buntime/webcore/ErrorEvent.h b/src/buntime/web/events/ErrorEvent.h
similarity index 100%
rename from src/buntime/webcore/ErrorEvent.h
rename to src/buntime/web/events/ErrorEvent.h
diff --git a/src/buntime/webcore/ErrorEvent.idl b/src/buntime/web/events/ErrorEvent.idl
similarity index 100%
rename from src/buntime/webcore/ErrorEvent.idl
rename to src/buntime/web/events/ErrorEvent.idl
diff --git a/src/buntime/webcore/Event.cpp b/src/buntime/web/events/Event.cpp
similarity index 100%
rename from src/buntime/webcore/Event.cpp
rename to src/buntime/web/events/Event.cpp
diff --git a/src/buntime/webcore/Event.h b/src/buntime/web/events/Event.h
similarity index 100%
rename from src/buntime/webcore/Event.h
rename to src/buntime/web/events/Event.h
diff --git a/src/buntime/webcore/Event.idl b/src/buntime/web/events/Event.idl
similarity index 100%
rename from src/buntime/webcore/Event.idl
rename to src/buntime/web/events/Event.idl
diff --git a/src/buntime/webcore/EventContext.cpp b/src/buntime/web/events/EventContext.cpp
similarity index 100%
rename from src/buntime/webcore/EventContext.cpp
rename to src/buntime/web/events/EventContext.cpp
diff --git a/src/buntime/webcore/EventContext.h b/src/buntime/web/events/EventContext.h
similarity index 100%
rename from src/buntime/webcore/EventContext.h
rename to src/buntime/web/events/EventContext.h
diff --git a/src/buntime/webcore/EventDispatcher.cpp b/src/buntime/web/events/EventDispatcher.cpp
similarity index 100%
rename from src/buntime/webcore/EventDispatcher.cpp
rename to src/buntime/web/events/EventDispatcher.cpp
diff --git a/src/buntime/webcore/EventDispatcher.h b/src/buntime/web/events/EventDispatcher.h
similarity index 100%
rename from src/buntime/webcore/EventDispatcher.h
rename to src/buntime/web/events/EventDispatcher.h
diff --git a/src/buntime/webcore/EventEmitter.cpp b/src/buntime/web/events/EventEmitter.cpp
similarity index 100%
rename from src/buntime/webcore/EventEmitter.cpp
rename to src/buntime/web/events/EventEmitter.cpp
diff --git a/src/buntime/webcore/EventEmitter.h b/src/buntime/web/events/EventEmitter.h
similarity index 100%
rename from src/buntime/webcore/EventEmitter.h
rename to src/buntime/web/events/EventEmitter.h
diff --git a/src/buntime/webcore/EventFactory.cpp b/src/buntime/web/events/EventFactory.cpp
similarity index 100%
rename from src/buntime/webcore/EventFactory.cpp
rename to src/buntime/web/events/EventFactory.cpp
diff --git a/src/buntime/webcore/EventHeaders.h b/src/buntime/web/events/EventHeaders.h
similarity index 100%
rename from src/buntime/webcore/EventHeaders.h
rename to src/buntime/web/events/EventHeaders.h
diff --git a/src/buntime/webcore/EventInit.h b/src/buntime/web/events/EventInit.h
similarity index 100%
rename from src/buntime/webcore/EventInit.h
rename to src/buntime/web/events/EventInit.h
diff --git a/src/buntime/webcore/EventInit.idl b/src/buntime/web/events/EventInit.idl
similarity index 100%
rename from src/buntime/webcore/EventInit.idl
rename to src/buntime/web/events/EventInit.idl
diff --git a/src/buntime/webcore/EventInterfaces.h b/src/buntime/web/events/EventInterfaces.h
similarity index 100%
rename from src/buntime/webcore/EventInterfaces.h
rename to src/buntime/web/events/EventInterfaces.h
diff --git a/src/buntime/webcore/EventListener.h b/src/buntime/web/events/EventListener.h
similarity index 100%
rename from src/buntime/webcore/EventListener.h
rename to src/buntime/web/events/EventListener.h
diff --git a/src/buntime/webcore/EventListener.idl b/src/buntime/web/events/EventListener.idl
similarity index 100%
rename from src/buntime/webcore/EventListener.idl
rename to src/buntime/web/events/EventListener.idl
diff --git a/src/buntime/webcore/EventListenerMap.cpp b/src/buntime/web/events/EventListenerMap.cpp
similarity index 100%
rename from src/buntime/webcore/EventListenerMap.cpp
rename to src/buntime/web/events/EventListenerMap.cpp
diff --git a/src/buntime/webcore/EventListenerMap.h b/src/buntime/web/events/EventListenerMap.h
similarity index 100%
rename from src/buntime/webcore/EventListenerMap.h
rename to src/buntime/web/events/EventListenerMap.h
diff --git a/src/buntime/webcore/EventListenerOptions.h b/src/buntime/web/events/EventListenerOptions.h
similarity index 100%
rename from src/buntime/webcore/EventListenerOptions.h
rename to src/buntime/web/events/EventListenerOptions.h
diff --git a/src/buntime/webcore/EventListenerOptions.idl b/src/buntime/web/events/EventListenerOptions.idl
similarity index 100%
rename from src/buntime/webcore/EventListenerOptions.idl
rename to src/buntime/web/events/EventListenerOptions.idl
diff --git a/src/buntime/webcore/EventModifierInit.h b/src/buntime/web/events/EventModifierInit.h
similarity index 100%
rename from src/buntime/webcore/EventModifierInit.h
rename to src/buntime/web/events/EventModifierInit.h
diff --git a/src/buntime/webcore/EventNames.cpp b/src/buntime/web/events/EventNames.cpp
similarity index 100%
rename from src/buntime/webcore/EventNames.cpp
rename to src/buntime/web/events/EventNames.cpp
diff --git a/src/buntime/webcore/EventNames.h b/src/buntime/web/events/EventNames.h
similarity index 100%
rename from src/buntime/webcore/EventNames.h
rename to src/buntime/web/events/EventNames.h
diff --git a/src/buntime/webcore/EventNames.in b/src/buntime/web/events/EventNames.in
similarity index 100%
rename from src/buntime/webcore/EventNames.in
rename to src/buntime/web/events/EventNames.in
diff --git a/src/buntime/webcore/EventOptions.h b/src/buntime/web/events/EventOptions.h
similarity index 100%
rename from src/buntime/webcore/EventOptions.h
rename to src/buntime/web/events/EventOptions.h
diff --git a/src/buntime/webcore/EventPath.cpp b/src/buntime/web/events/EventPath.cpp
similarity index 100%
rename from src/buntime/webcore/EventPath.cpp
rename to src/buntime/web/events/EventPath.cpp
diff --git a/src/buntime/webcore/EventPath.h b/src/buntime/web/events/EventPath.h
similarity index 100%
rename from src/buntime/webcore/EventPath.h
rename to src/buntime/web/events/EventPath.h
diff --git a/src/buntime/webcore/EventSender.h b/src/buntime/web/events/EventSender.h
similarity index 100%
rename from src/buntime/webcore/EventSender.h
rename to src/buntime/web/events/EventSender.h
diff --git a/src/buntime/webcore/EventTarget.cpp b/src/buntime/web/events/EventTarget.cpp
similarity index 100%
rename from src/buntime/webcore/EventTarget.cpp
rename to src/buntime/web/events/EventTarget.cpp
diff --git a/src/buntime/webcore/EventTarget.h b/src/buntime/web/events/EventTarget.h
similarity index 100%
rename from src/buntime/webcore/EventTarget.h
rename to src/buntime/web/events/EventTarget.h
diff --git a/src/buntime/webcore/EventTarget.idl b/src/buntime/web/events/EventTarget.idl
similarity index 100%
rename from src/buntime/webcore/EventTarget.idl
rename to src/buntime/web/events/EventTarget.idl
diff --git a/src/buntime/webcore/EventTargetConcrete.cpp b/src/buntime/web/events/EventTargetConcrete.cpp
similarity index 100%
rename from src/buntime/webcore/EventTargetConcrete.cpp
rename to src/buntime/web/events/EventTargetConcrete.cpp
diff --git a/src/buntime/webcore/EventTargetConcrete.h b/src/buntime/web/events/EventTargetConcrete.h
similarity index 100%
rename from src/buntime/webcore/EventTargetConcrete.h
rename to src/buntime/web/events/EventTargetConcrete.h
diff --git a/src/buntime/webcore/EventTargetFactory.cpp b/src/buntime/web/events/EventTargetFactory.cpp
similarity index 100%
rename from src/buntime/webcore/EventTargetFactory.cpp
rename to src/buntime/web/events/EventTargetFactory.cpp
diff --git a/src/buntime/webcore/EventTargetHeaders.h b/src/buntime/web/events/EventTargetHeaders.h
similarity index 100%
rename from src/buntime/webcore/EventTargetHeaders.h
rename to src/buntime/web/events/EventTargetHeaders.h
diff --git a/src/buntime/webcore/EventTargetInterfaces.h b/src/buntime/web/events/EventTargetInterfaces.h
similarity index 100%
rename from src/buntime/webcore/EventTargetInterfaces.h
rename to src/buntime/web/events/EventTargetInterfaces.h
diff --git a/src/buntime/bindings/EventType.zig b/src/buntime/web/events/EventType.zig
similarity index 100%
rename from src/buntime/bindings/EventType.zig
rename to src/buntime/web/events/EventType.zig
diff --git a/src/buntime/webcore/IdentifierEventListenerMap.cpp b/src/buntime/web/events/IdentifierEventListenerMap.cpp
similarity index 100%
rename from src/buntime/webcore/IdentifierEventListenerMap.cpp
rename to src/buntime/web/events/IdentifierEventListenerMap.cpp
diff --git a/src/buntime/webcore/IdentifierEventListenerMap.h b/src/buntime/web/events/IdentifierEventListenerMap.h
similarity index 100%
rename from src/buntime/webcore/IdentifierEventListenerMap.h
rename to src/buntime/web/events/IdentifierEventListenerMap.h
diff --git a/src/buntime/webcore/JSAddEventListenerOptions.cpp b/src/buntime/web/events/JSAddEventListenerOptions.cpp
similarity index 100%
rename from src/buntime/webcore/JSAddEventListenerOptions.cpp
rename to src/buntime/web/events/JSAddEventListenerOptions.cpp
diff --git a/src/buntime/webcore/JSAddEventListenerOptions.h b/src/buntime/web/events/JSAddEventListenerOptions.h
similarity index 100%
rename from src/buntime/webcore/JSAddEventListenerOptions.h
rename to src/buntime/web/events/JSAddEventListenerOptions.h
diff --git a/src/buntime/webcore/JSBroadcastChannel.cpp b/src/buntime/web/events/JSBroadcastChannel.cpp
similarity index 100%
rename from src/buntime/webcore/JSBroadcastChannel.cpp
rename to src/buntime/web/events/JSBroadcastChannel.cpp
diff --git a/src/buntime/webcore/JSBroadcastChannel.h b/src/buntime/web/events/JSBroadcastChannel.h
similarity index 100%
rename from src/buntime/webcore/JSBroadcastChannel.h
rename to src/buntime/web/events/JSBroadcastChannel.h
diff --git a/src/buntime/webcore/JSCloseEvent.cpp b/src/buntime/web/events/JSCloseEvent.cpp
similarity index 100%
rename from src/buntime/webcore/JSCloseEvent.cpp
rename to src/buntime/web/events/JSCloseEvent.cpp
diff --git a/src/buntime/webcore/JSCloseEvent.h b/src/buntime/web/events/JSCloseEvent.h
similarity index 100%
rename from src/buntime/webcore/JSCloseEvent.h
rename to src/buntime/web/events/JSCloseEvent.h
diff --git a/src/buntime/webcore/JSCustomEvent.cpp b/src/buntime/web/events/JSCustomEvent.cpp
similarity index 100%
rename from src/buntime/webcore/JSCustomEvent.cpp
rename to src/buntime/web/events/JSCustomEvent.cpp
diff --git a/src/buntime/webcore/JSCustomEvent.h b/src/buntime/web/events/JSCustomEvent.h
similarity index 100%
rename from src/buntime/webcore/JSCustomEvent.h
rename to src/buntime/web/events/JSCustomEvent.h
diff --git a/src/buntime/webcore/JSDOMConvertEventListener.h b/src/buntime/web/events/JSDOMConvertEventListener.h
similarity index 100%
rename from src/buntime/webcore/JSDOMConvertEventListener.h
rename to src/buntime/web/events/JSDOMConvertEventListener.h
diff --git a/src/buntime/webcore/JSErrorEvent.cpp b/src/buntime/web/events/JSErrorEvent.cpp
similarity index 100%
rename from src/buntime/webcore/JSErrorEvent.cpp
rename to src/buntime/web/events/JSErrorEvent.cpp
diff --git a/src/buntime/webcore/JSErrorEvent.h b/src/buntime/web/events/JSErrorEvent.h
similarity index 100%
rename from src/buntime/webcore/JSErrorEvent.h
rename to src/buntime/web/events/JSErrorEvent.h
diff --git a/src/buntime/webcore/JSErrorEventCustom.cpp b/src/buntime/web/events/JSErrorEventCustom.cpp
similarity index 100%
rename from src/buntime/webcore/JSErrorEventCustom.cpp
rename to src/buntime/web/events/JSErrorEventCustom.cpp
diff --git a/src/buntime/webcore/JSEvent.cpp b/src/buntime/web/events/JSEvent.cpp
similarity index 100%
rename from src/buntime/webcore/JSEvent.cpp
rename to src/buntime/web/events/JSEvent.cpp
diff --git a/src/buntime/webcore/JSEvent.h b/src/buntime/web/events/JSEvent.h
similarity index 100%
rename from src/buntime/webcore/JSEvent.h
rename to src/buntime/web/events/JSEvent.h
diff --git a/src/buntime/webcore/JSEventCustom.cpp b/src/buntime/web/events/JSEventCustom.cpp
similarity index 100%
rename from src/buntime/webcore/JSEventCustom.cpp
rename to src/buntime/web/events/JSEventCustom.cpp
diff --git a/src/buntime/webcore/JSEventCustom.h b/src/buntime/web/events/JSEventCustom.h
similarity index 100%
rename from src/buntime/webcore/JSEventCustom.h
rename to src/buntime/web/events/JSEventCustom.h
diff --git a/src/buntime/webcore/JSEventDOMJIT.cpp b/src/buntime/web/events/JSEventDOMJIT.cpp
similarity index 100%
rename from src/buntime/webcore/JSEventDOMJIT.cpp
rename to src/buntime/web/events/JSEventDOMJIT.cpp
diff --git a/src/buntime/webcore/JSEventEmitter.cpp b/src/buntime/web/events/JSEventEmitter.cpp
similarity index 100%
rename from src/buntime/webcore/JSEventEmitter.cpp
rename to src/buntime/web/events/JSEventEmitter.cpp
diff --git a/src/buntime/webcore/JSEventEmitter.h b/src/buntime/web/events/JSEventEmitter.h
similarity index 100%
rename from src/buntime/webcore/JSEventEmitter.h
rename to src/buntime/web/events/JSEventEmitter.h
diff --git a/src/buntime/webcore/JSEventEmitterCustom.cpp b/src/buntime/web/events/JSEventEmitterCustom.cpp
similarity index 100%
rename from src/buntime/webcore/JSEventEmitterCustom.cpp
rename to src/buntime/web/events/JSEventEmitterCustom.cpp
diff --git a/src/buntime/webcore/JSEventEmitterCustom.h b/src/buntime/web/events/JSEventEmitterCustom.h
similarity index 100%
rename from src/buntime/webcore/JSEventEmitterCustom.h
rename to src/buntime/web/events/JSEventEmitterCustom.h
diff --git a/src/buntime/webcore/JSEventInit.cpp b/src/buntime/web/events/JSEventInit.cpp
similarity index 100%
rename from src/buntime/webcore/JSEventInit.cpp
rename to src/buntime/web/events/JSEventInit.cpp
diff --git a/src/buntime/webcore/JSEventInit.h b/src/buntime/web/events/JSEventInit.h
similarity index 100%
rename from src/buntime/webcore/JSEventInit.h
rename to src/buntime/web/events/JSEventInit.h
diff --git a/src/buntime/webcore/JSEventListener.cpp b/src/buntime/web/events/JSEventListener.cpp
similarity index 100%
rename from src/buntime/webcore/JSEventListener.cpp
rename to src/buntime/web/events/JSEventListener.cpp
diff --git a/src/buntime/webcore/JSEventListener.h b/src/buntime/web/events/JSEventListener.h
similarity index 100%
rename from src/buntime/webcore/JSEventListener.h
rename to src/buntime/web/events/JSEventListener.h
diff --git a/src/buntime/webcore/JSEventListenerOptions.cpp b/src/buntime/web/events/JSEventListenerOptions.cpp
similarity index 100%
rename from src/buntime/webcore/JSEventListenerOptions.cpp
rename to src/buntime/web/events/JSEventListenerOptions.cpp
diff --git a/src/buntime/webcore/JSEventListenerOptions.h b/src/buntime/web/events/JSEventListenerOptions.h
similarity index 100%
rename from src/buntime/webcore/JSEventListenerOptions.h
rename to src/buntime/web/events/JSEventListenerOptions.h
diff --git a/src/buntime/webcore/JSEventModifierInit.cpp b/src/buntime/web/events/JSEventModifierInit.cpp
similarity index 100%
rename from src/buntime/webcore/JSEventModifierInit.cpp
rename to src/buntime/web/events/JSEventModifierInit.cpp
diff --git a/src/buntime/webcore/JSEventModifierInit.h b/src/buntime/web/events/JSEventModifierInit.h
similarity index 100%
rename from src/buntime/webcore/JSEventModifierInit.h
rename to src/buntime/web/events/JSEventModifierInit.h
diff --git a/src/buntime/webcore/JSEventTarget.cpp b/src/buntime/web/events/JSEventTarget.cpp
similarity index 100%
rename from src/buntime/webcore/JSEventTarget.cpp
rename to src/buntime/web/events/JSEventTarget.cpp
diff --git a/src/buntime/webcore/JSEventTarget.h b/src/buntime/web/events/JSEventTarget.h
similarity index 100%
rename from src/buntime/webcore/JSEventTarget.h
rename to src/buntime/web/events/JSEventTarget.h
diff --git a/src/buntime/webcore/JSEventTargetCustom.cpp b/src/buntime/web/events/JSEventTargetCustom.cpp
similarity index 100%
rename from src/buntime/webcore/JSEventTargetCustom.cpp
rename to src/buntime/web/events/JSEventTargetCustom.cpp
diff --git a/src/buntime/webcore/JSEventTargetCustom.h b/src/buntime/web/events/JSEventTargetCustom.h
similarity index 100%
rename from src/buntime/webcore/JSEventTargetCustom.h
rename to src/buntime/web/events/JSEventTargetCustom.h
diff --git a/src/buntime/webcore/JSEventTargetNode.cpp b/src/buntime/web/events/JSEventTargetNode.cpp
similarity index 100%
rename from src/buntime/webcore/JSEventTargetNode.cpp
rename to src/buntime/web/events/JSEventTargetNode.cpp
diff --git a/src/buntime/webcore/JSEventTargetNode.h b/src/buntime/web/events/JSEventTargetNode.h
similarity index 100%
rename from src/buntime/webcore/JSEventTargetNode.h
rename to src/buntime/web/events/JSEventTargetNode.h
diff --git a/src/buntime/webcore/JSMessageEvent.cpp b/src/buntime/web/events/JSMessageEvent.cpp
similarity index 100%
rename from src/buntime/webcore/JSMessageEvent.cpp
rename to src/buntime/web/events/JSMessageEvent.cpp
diff --git a/src/buntime/webcore/JSMessageEvent.h b/src/buntime/web/events/JSMessageEvent.h
similarity index 100%
rename from src/buntime/webcore/JSMessageEvent.h
rename to src/buntime/web/events/JSMessageEvent.h
diff --git a/src/buntime/webcore/JSMessageEventCustom.cpp b/src/buntime/web/events/JSMessageEventCustom.cpp
similarity index 100%
rename from src/buntime/webcore/JSMessageEventCustom.cpp
rename to src/buntime/web/events/JSMessageEventCustom.cpp
diff --git a/src/buntime/webcore/JSMessagePort.cpp b/src/buntime/web/events/JSMessagePort.cpp
similarity index 100%
rename from src/buntime/webcore/JSMessagePort.cpp
rename to src/buntime/web/events/JSMessagePort.cpp
diff --git a/src/buntime/webcore/JSMessagePort.h b/src/buntime/web/events/JSMessagePort.h
similarity index 100%
rename from src/buntime/webcore/JSMessagePort.h
rename to src/buntime/web/events/JSMessagePort.h
diff --git a/src/buntime/webcore/JSMessagePortCustom.cpp b/src/buntime/web/events/JSMessagePortCustom.cpp
similarity index 100%
rename from src/buntime/webcore/JSMessagePortCustom.cpp
rename to src/buntime/web/events/JSMessagePortCustom.cpp
diff --git a/src/buntime/webcore/MessageEvent.cpp b/src/buntime/web/events/MessageEvent.cpp
similarity index 100%
rename from src/buntime/webcore/MessageEvent.cpp
rename to src/buntime/web/events/MessageEvent.cpp
diff --git a/src/buntime/webcore/MessageEvent.h b/src/buntime/web/events/MessageEvent.h
similarity index 100%
rename from src/buntime/webcore/MessageEvent.h
rename to src/buntime/web/events/MessageEvent.h
diff --git a/src/buntime/webcore/MessageEvent.idl b/src/buntime/web/events/MessageEvent.idl
similarity index 100%
rename from src/buntime/webcore/MessageEvent.idl
rename to src/buntime/web/events/MessageEvent.idl
diff --git a/src/buntime/webcore/MessagePort.cpp b/src/buntime/web/events/MessagePort.cpp
similarity index 100%
rename from src/buntime/webcore/MessagePort.cpp
rename to src/buntime/web/events/MessagePort.cpp
diff --git a/src/buntime/webcore/MessagePort.h b/src/buntime/web/events/MessagePort.h
similarity index 100%
rename from src/buntime/webcore/MessagePort.h
rename to src/buntime/web/events/MessagePort.h
diff --git a/src/buntime/webcore/MessagePortChannel.cpp b/src/buntime/web/events/MessagePortChannel.cpp
similarity index 100%
rename from src/buntime/webcore/MessagePortChannel.cpp
rename to src/buntime/web/events/MessagePortChannel.cpp
diff --git a/src/buntime/webcore/MessagePortChannel.h b/src/buntime/web/events/MessagePortChannel.h
similarity index 100%
rename from src/buntime/webcore/MessagePortChannel.h
rename to src/buntime/web/events/MessagePortChannel.h
diff --git a/src/buntime/webcore/MessagePortChannelProvider.cpp b/src/buntime/web/events/MessagePortChannelProvider.cpp
similarity index 100%
rename from src/buntime/webcore/MessagePortChannelProvider.cpp
rename to src/buntime/web/events/MessagePortChannelProvider.cpp
diff --git a/src/buntime/webcore/MessagePortChannelProvider.h b/src/buntime/web/events/MessagePortChannelProvider.h
similarity index 100%
rename from src/buntime/webcore/MessagePortChannelProvider.h
rename to src/buntime/web/events/MessagePortChannelProvider.h
diff --git a/src/buntime/webcore/MessagePortChannelProviderImpl.cpp b/src/buntime/web/events/MessagePortChannelProviderImpl.cpp
similarity index 100%
rename from src/buntime/webcore/MessagePortChannelProviderImpl.cpp
rename to src/buntime/web/events/MessagePortChannelProviderImpl.cpp
diff --git a/src/buntime/webcore/MessagePortChannelProviderImpl.h b/src/buntime/web/events/MessagePortChannelProviderImpl.h
similarity index 100%
rename from src/buntime/webcore/MessagePortChannelProviderImpl.h
rename to src/buntime/web/events/MessagePortChannelProviderImpl.h
diff --git a/src/buntime/webcore/MessagePortChannelRegistry.cpp b/src/buntime/web/events/MessagePortChannelRegistry.cpp
similarity index 100%
rename from src/buntime/webcore/MessagePortChannelRegistry.cpp
rename to src/buntime/web/events/MessagePortChannelRegistry.cpp
diff --git a/src/buntime/webcore/MessagePortChannelRegistry.h b/src/buntime/web/events/MessagePortChannelRegistry.h
similarity index 100%
rename from src/buntime/webcore/MessagePortChannelRegistry.h
rename to src/buntime/web/events/MessagePortChannelRegistry.h
diff --git a/src/buntime/webcore/MessagePortIdentifier.h b/src/buntime/web/events/MessagePortIdentifier.h
similarity index 100%
rename from src/buntime/webcore/MessagePortIdentifier.h
rename to src/buntime/web/events/MessagePortIdentifier.h
diff --git a/src/buntime/webcore/MessageWithMessagePorts.h b/src/buntime/web/events/MessageWithMessagePorts.h
similarity index 100%
rename from src/buntime/webcore/MessageWithMessagePorts.h
rename to src/buntime/web/events/MessageWithMessagePorts.h
diff --git a/src/buntime/webcore/RegisteredEventListener.h b/src/buntime/web/events/RegisteredEventListener.h
similarity index 100%
rename from src/buntime/webcore/RegisteredEventListener.h
rename to src/buntime/web/events/RegisteredEventListener.h
diff --git a/src/buntime/webcore/TransferredMessagePort.h b/src/buntime/web/events/TransferredMessagePort.h
similarity index 100%
rename from src/buntime/webcore/TransferredMessagePort.h
rename to src/buntime/web/events/TransferredMessagePort.h
diff --git a/src/buntime/webcore/UIEventInit.h b/src/buntime/web/events/UIEventInit.h
similarity index 100%
rename from src/buntime/webcore/UIEventInit.h
rename to src/buntime/web/events/UIEventInit.h
diff --git a/src/buntime/webcore.zig b/src/buntime/webcore.zig
index 590f5d572e..117b96f1d2 100644
--- a/src/buntime/webcore.zig
+++ b/src/buntime/webcore.zig
@@ -13,7 +13,7 @@ pub const DOMExceptionCode = @import("./api/error/JSErrorCode.zig").DOMException
 pub const ByteListPool = bun.ObjectPool(bun.ByteList, null, true, 8);
 
 pub const Crypto = @import("./webcore/Crypto.zig");
-pub const AbortSignal = @import("./bindings/AbortSignal.zig").AbortSignal;
+pub const AbortSignal = @import("./web/events/AbortSignal.zig").AbortSignal;
 pub const WebWorker = @import("./web_worker.zig");
 pub const AutoFlusher = @import("./webcore/AutoFlusher.zig");
 pub const EncodingLabel = @import("./web/encoding/EncodingLabel.zig").EncodingLabel;