diff --git a/frontend/src/ts/signals/config.ts b/frontend/src/ts/signals/config.ts
new file mode 100644
index 000000000..6fa08ea2d
--- /dev/null
+++ b/frontend/src/ts/signals/config.ts
@@ -0,0 +1,13 @@
+import { createSignal } from "solid-js";
+import * as ConfigEvent from "../observables/config-event";
+import config from "../config";
+
+export const [getLiveSpeedStyle, setLifeSpeedStype] = createSignal(
+  config.liveSpeedStyle,
+);
+
+ConfigEvent.subscribe(({ key, newValue }) => {
+  if (key === "liveSpeedStyle") {
+    setLifeSpeedStype(newValue);
+  }
+});
diff --git a/frontend/src/ts/signals/live-states.ts b/frontend/src/ts/signals/live-states.ts
new file mode 100644
index 000000000..da44df438
--- /dev/null
+++ b/frontend/src/ts/signals/live-states.ts
@@ -0,0 +1,4 @@
+import { createSignal } from "solid-js";
+export const [getWpm, setWpm] = createSignal("0");
+export const [getAcc, setAcc] = createSignal(0);
+export const [getBurst, setBurst] = createSignal(0);
diff --git a/frontend/src/ts/test/live-states.tsx b/frontend/src/ts/test/live-states.tsx
index 9e96671b3..24b836bd4 100644
--- a/frontend/src/ts/test/live-states.tsx
+++ b/frontend/src/ts/test/live-states.tsx
@@ -1,17 +1,9 @@
-import { createMemo, createSignal } from "solid-js";
+import { createMemo } from "solid-js";
 import { qsr } from "../utils/dom";
 import { LiveCounter } from "./live-counter";
 import { render } from "solid-js/web";
-import config from "../config";
-import * as ConfigEvent from "../observables/config-event";
-
-export const [getWpm, setWpm] = createSignal("0");
-export const [getAcc, setAcc] = createSignal(0);
-export const [getBurst, setBurst] = createSignal(0);
-
-const [getLiveSpeedStyle, setLifeSpeedStype] = createSignal(
-  config.liveSpeedStyle,
-);
+import { getWpm } from "../signals/live-states";
+import { getLiveSpeedStyle } from "../signals/config";
 
 const liveWpm = createMemo(() => {
   return getLiveSpeedStyle() !== "off" ? getWpm() : "";
@@ -23,9 +15,3 @@ export function mountLiveCounters(): void {
     qsr("#liveSpeedCounter").native,
   );
 }
-
-ConfigEvent.subscribe(({ key, newValue }) => {
-  if (key === "liveSpeedStyle") {
-    setLifeSpeedStype(newValue);
-  }
-});
diff --git a/frontend/src/ts/test/test-timer.ts b/frontend/src/ts/test/test-timer.ts
index 6fdac0473..3ec01820e 100644
--- a/frontend/src/ts/test/test-timer.ts
+++ b/frontend/src/ts/test/test-timer.ts
@@ -21,7 +21,7 @@ import * as SoundController from "../controllers/sound-controller";
 import { clearLowFpsMode, setLowFpsMode } from "../anim";
 import { createTimer } from "animejs";
 import { requestDebouncedAnimationFrame } from "../utils/debounced-animation-frame";
-import { setWpm } from "./live-states";
+import { setWpm } from "../signals/live-states";
 import Format from "../utils/format";
 
 let lastLoop = 0;
diff --git a/frontend/src/ts/test/test-ui.ts b/frontend/src/ts/test/test-ui.ts
index 8039e98dd..597724760 100644
--- a/frontend/src/ts/test/test-ui.ts
+++ b/frontend/src/ts/test/test-ui.ts
@@ -58,7 +58,7 @@ import * as ModesNotice from "../elements/modes-notice";
 import * as Last10Average from "../elements/last-10-average";
 import * as MemoryFunboxTimer from "./funbox/memory-funbox-timer";
 import { qsr } from "../utils/dom";
-import { setWpm } from "./live-states";
+import { setWpm } from "../signals/live-states";
 
 export const updateHintsPositionDebounced = Misc.debounceUntilResolved(
   updateHintsPosition,