diff --git a/src/lib/stores/serial.options.ts b/src/lib/stores/serial/serial.options.ts
similarity index 100%
rename from src/lib/stores/serial.options.ts
rename to src/lib/stores/serial/serial.options.ts
diff --git a/src/lib/stores/serial.ts b/src/lib/stores/serial/serial.ts
similarity index 96%
rename from src/lib/stores/serial.ts
rename to src/lib/stores/serial/serial.ts
index 44aa4ed..61a5cfc 100644
--- a/src/lib/stores/serial.ts
+++ b/src/lib/stores/serial/serial.ts
@@ -1,5 +1,5 @@
 import { derived, writable, get } from 'svelte/store';
-import { useLocalStorage } from './utils/useLocalStorage';
+import { useLocalStorage } from '../utils/useLocalStorage';
 
 export type ReadType = 'hex' | 'ascii' | 'dec';
 
diff --git a/src/lib/stores/serial.ui.ts b/src/lib/stores/serial/serial.ui.ts
similarity index 92%
rename from src/lib/stores/serial.ui.ts
rename to src/lib/stores/serial/serial.ui.ts
index e3d228c..0c2cbb7 100644
--- a/src/lib/stores/serial.ui.ts
+++ b/src/lib/stores/serial/serial.ui.ts
@@ -1,7 +1,7 @@
 import { derived } from 'svelte/store';
 import { baudRate, baudRateList, dataBits, parity, stopBits } from './serial';
-import { createUIBridge } from './utils/uiBridge';
-import { isOneOf } from './utils/typeGuard';
+import { createUIBridge } from '../utils/uiBridge';
+import { isOneOf } from '../utils/typeGuard';
 
 export const baudRateItems = derived(baudRateList, ($list) =>
   $list.map((rate) => ({