diff --git a/src/index.ts b/src/index.ts
index ef3e8c6..6258c2e 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,8 +1,8 @@
 import { getBuildConfig } from "./build-config" with { type: "macro" };
 import "./utils/global";
-import { BxEvent } from "./modules/bx-event";
-import { BX_FLAGS } from "./modules/bx-flags";
-import { BxExposed } from "./modules/bx-exposed";
+import { BxEvent } from "./utils/bx-event";
+import { BX_FLAGS } from "./utils/bx-flags";
+import { BxExposed } from "./utils/bx-exposed";
 import { t } from "./modules/translation";
 import { CE } from "./utils/html";
 import { showGamepadToast } from "./utils/gamepad";
diff --git a/src/modules/mkb/mkb-handler.ts b/src/modules/mkb/mkb-handler.ts
index 6f58da2..9ba6200 100644
--- a/src/modules/mkb/mkb-handler.ts
+++ b/src/modules/mkb/mkb-handler.ts
@@ -1,7 +1,7 @@
 import { MkbPreset } from "./mkb-preset";
 import { GamepadKey, MkbPresetKey, GamepadStick, MouseMapTo } from "./definitions";
 import { createButton, Icon, ButtonStyle, CE } from "../../utils/html";
-import { BxEvent } from "../bx-event";
+import { BxEvent } from "../../utils/bx-event";
 import { PrefKey, getPref } from "../preferences";
 import { Toast } from "../../utils/toast";
 import { t } from "../translation";
diff --git a/src/modules/patcher.ts b/src/modules/patcher.ts
index 7da186d..d867412 100644
--- a/src/modules/patcher.ts
+++ b/src/modules/patcher.ts
@@ -1,5 +1,5 @@
 import { STATES } from "../utils/global";
-import { BX_FLAGS } from "./bx-flags";
+import { BX_FLAGS } from "../utils/bx-flags";
 import { getPref, PrefKey } from "./preferences";
 import { VibrationManager } from "./vibration-manager";
 
diff --git a/src/modules/remote-play.ts b/src/modules/remote-play.ts
index e808c44..6276f21 100644
--- a/src/modules/remote-play.ts
+++ b/src/modules/remote-play.ts
@@ -1,7 +1,7 @@
 import { STATES, AppInterface } from "../utils/global";
 import { CE, createButton, ButtonStyle, Icon } from "../utils/html";
 import { Toast } from "../utils/toast";
-import { BxEvent } from "./bx-event";
+import { BxEvent } from "../utils/bx-event";
 import { getPref, PrefKey, setPref } from "./preferences";
 import { t } from "./translation";
 import { localRedirect } from "./ui/ui";
diff --git a/src/modules/stream/stream-badges.ts b/src/modules/stream/stream-badges.ts
index 2d97a6d..51a56af 100644
--- a/src/modules/stream/stream-badges.ts
+++ b/src/modules/stream/stream-badges.ts
@@ -1,5 +1,5 @@
 import { t } from "../translation";
-import { BxEvent } from "../bx-event";
+import { BxEvent } from "../../utils/bx-event";
 import { CE } from "../../utils/html";
 import { STATES } from "../../utils/global";
 
diff --git a/src/modules/stream/stream-stats.ts b/src/modules/stream/stream-stats.ts
index 8a341ec..35e2b94 100644
--- a/src/modules/stream/stream-stats.ts
+++ b/src/modules/stream/stream-stats.ts
@@ -1,5 +1,5 @@
 import { PrefKey } from "../preferences"
-import { BxEvent } from "../bx-event"
+import { BxEvent } from "../../utils/bx-event"
 import { getPref } from "../preferences"
 import { StreamBadges } from "./stream-badges"
 import { CE } from "../../utils/html"
diff --git a/src/modules/stream/stream-ui.ts b/src/modules/stream/stream-ui.ts
index 7c41c42..d3b72bd 100644
--- a/src/modules/stream/stream-ui.ts
+++ b/src/modules/stream/stream-ui.ts
@@ -1,6 +1,6 @@
 import { STATES } from "../../utils/global";
 import { Icon } from "../../utils/html";
-import { BxEvent } from "../bx-event";
+import { BxEvent } from "../../utils/bx-event";
 import { PrefKey, getPref } from "../preferences";
 import { t } from "../translation";
 import { StreamBadges } from "./stream-badges";
diff --git a/src/modules/touch-controller.ts b/src/modules/touch-controller.ts
index 97e6c26..7eb014e 100644
--- a/src/modules/touch-controller.ts
+++ b/src/modules/touch-controller.ts
@@ -1,8 +1,8 @@
 import { NATIVE_FETCH, STATES } from "../utils/global";
 import { CE } from "../utils/html";
 import { Toast } from "../utils/toast";
-import { BxEvent } from "./bx-event";
-import { BX_FLAGS } from "./bx-flags";
+import { BxEvent } from "../utils/bx-event";
+import { BX_FLAGS } from "../utils/bx-flags";
 import { getPref, PrefKey } from "./preferences";
 import { t } from "./translation";
 
diff --git a/src/modules/ui/ui.ts b/src/modules/ui/ui.ts
index 6ce7502..e7d6f77 100644
--- a/src/modules/ui/ui.ts
+++ b/src/modules/ui/ui.ts
@@ -1,7 +1,7 @@
 import { STATES } from "../../utils/global";
 import { Icon, CE, createButton, ButtonStyle } from "../../utils/html";
 import { UserAgent } from "../../utils/user-agent";
-import { BxEvent } from "../bx-event";
+import { BxEvent } from "../../utils/bx-event";
 import { MkbRemapper } from "../mkb/mkb-remapper";
 import { getPref, PrefKey, toPrefElement } from "../preferences";
 import { setupScreenshotButton } from "../screenshot";
diff --git a/src/modules/vibration-manager.ts b/src/modules/vibration-manager.ts
index cb2bb96..a941b1b 100644
--- a/src/modules/vibration-manager.ts
+++ b/src/modules/vibration-manager.ts
@@ -1,5 +1,5 @@
 import { AppInterface } from "../utils/global";
-import { BxEvent } from "./bx-event";
+import { BxEvent } from "../utils/bx-event";
 import { PrefKey, getPref } from "./preferences";
 
 const VIBRATION_DATA_MAP = {
diff --git a/src/modules/bx-event.ts b/src/utils/bx-event.ts
similarity index 96%
rename from src/modules/bx-event.ts
rename to src/utils/bx-event.ts
index 0733702..739fdd4 100644
--- a/src/modules/bx-event.ts
+++ b/src/utils/bx-event.ts
@@ -1,4 +1,4 @@
-import { AppInterface } from "../utils/global";
+import { AppInterface } from "./global";
 
 export enum BxEvent {
     JUMP_BACK_IN_READY = 'bx-jump-back-in-ready',
diff --git a/src/modules/bx-exposed.ts b/src/utils/bx-exposed.ts
similarity index 95%
rename from src/modules/bx-exposed.ts
rename to src/utils/bx-exposed.ts
index d89a49a..af206ec 100644
--- a/src/modules/bx-exposed.ts
+++ b/src/utils/bx-exposed.ts
@@ -1,4 +1,4 @@
-import { STATES } from "../utils/global";
+import { STATES } from "./global";
 
 export const BxExposed = {
     onPollingModeChanged: (mode: 'All' | 'None') => {
diff --git a/src/modules/bx-flags.ts b/src/utils/bx-flags.ts
similarity index 100%
rename from src/modules/bx-flags.ts
rename to src/utils/bx-flags.ts
diff --git a/src/utils/history.ts b/src/utils/history.ts
index 2fb67b9..3b367d3 100644
--- a/src/utils/history.ts
+++ b/src/utils/history.ts
@@ -1,4 +1,4 @@
-import { BxEvent } from "../modules/bx-event";
+import { BxEvent } from "./bx-event";
 import { LoadingScreen } from "../modules/loading-screen";
 import { RemotePlay } from "../modules/remote-play";
 import { checkHeader } from "../modules/ui/header";
diff --git a/src/utils/monkey-patches.ts b/src/utils/monkey-patches.ts
index 5372db8..1293935 100644
--- a/src/utils/monkey-patches.ts
+++ b/src/utils/monkey-patches.ts
@@ -1,4 +1,4 @@
-import { BxEvent } from "../modules/bx-event";
+import { BxEvent } from "./bx-event";
 import { getPref, PrefKey } from "../modules/preferences";
 import { STATES } from "./global";
 import { UserAgent } from "./user-agent";
diff --git a/src/utils/network.ts b/src/utils/network.ts
index 310598c..c5d2340 100644
--- a/src/utils/network.ts
+++ b/src/utils/network.ts
@@ -1,5 +1,5 @@
-import { BxEvent } from "../modules/bx-event";
-import { BX_FLAGS } from "../modules/bx-flags";
+import { BxEvent } from "./bx-event";
+import { BX_FLAGS } from "./bx-flags";
 import { LoadingScreen } from "../modules/loading-screen";
 import { PrefKey, getPref } from "../modules/preferences";
 import { RemotePlay } from "../modules/remote-play";