diff --git a/README.md b/README.md
index caf69591..2ddddfa4 100644
--- a/README.md
+++ b/README.md
@@ -3,12 +3,12 @@
 ## Built Using:
 
 -   React 18
--   Typescript
+-   TypeScript
 -   Webpack 5 (esbuild-loader)
--   Eslint
+-   ESLint
 -   Prettier
 -   Semantic-Release
--   Custom Messaging & Storage wrappers
+-   Custom Messaging & Storage Wrappers
 
 ## Getting Started
 
diff --git a/src/background/background.ts b/src/background/background.ts
index d5c51749..37e15c63 100644
--- a/src/background/background.ts
+++ b/src/background/background.ts
@@ -5,7 +5,7 @@ import onInstall from './events/onInstall';
 import onNewChromeSession from './events/onNewChromeSession';
 import onServiceWorkerAlive from './events/onServiceWorkerAlive';
 import onUpdate from './events/onUpdate';
-import { sessionStore } from '../shared/storage/sessionStore';
+import { sessionStore } from '../shared/storage/SessionStore';
 import browserActionHandler from './handler/browserActionHandler';
 import hotReloadingHandler from './handler/hotReloadingHandler';
 import tabManagementHandler from './handler/tabManagementHandler';
diff --git a/src/background/events/onInstall.ts b/src/background/events/onInstall.ts
index d6a46128..c8abd92e 100644
--- a/src/background/events/onInstall.ts
+++ b/src/background/events/onInstall.ts
@@ -1,4 +1,4 @@
-import { extensionStore } from '../../shared/storage/extensionStore';
+import { extensionStore } from '../../shared/storage/ExtensionStore';
 
 /**
  * Called when the extension is first installed or synced onto a new machine
diff --git a/src/background/events/onUpdate.ts b/src/background/events/onUpdate.ts
index d8821923..62a9cb13 100644
--- a/src/background/events/onUpdate.ts
+++ b/src/background/events/onUpdate.ts
@@ -1,5 +1,5 @@
 import { hotReloadTab } from 'src/background/util/hotReloadTab';
-import { extensionStore } from '../../shared/storage/extensionStore';
+import { extensionStore } from '../../shared/storage/ExtensionStore';
 
 /**
  * Called when the extension is updated (or when the extension is reloaded in development mode)
diff --git a/src/background/handler/hotReloadingHandler.ts b/src/background/handler/hotReloadingHandler.ts
index 791c5fec..b71031ee 100644
--- a/src/background/handler/hotReloadingHandler.ts
+++ b/src/background/handler/hotReloadingHandler.ts
@@ -1,6 +1,6 @@
 import HotReloadingMessages from 'src/shared/messages/HotReloadingMessages';
 import { MessageHandler } from 'chrome-extension-toolkit';
-import { devStore } from 'src/shared/storage/devStore';
+import { devStore } from 'src/shared/storage/DevStore';
 
 const hotReloadingHandler: MessageHandler<HotReloadingMessages> = {
     async reloadExtension({ sendResponse }) {
diff --git a/src/background/lib/addCourse.ts b/src/background/lib/addCourse.ts
index c90ae0b1..eff142ae 100644
--- a/src/background/lib/addCourse.ts
+++ b/src/background/lib/addCourse.ts
@@ -1,4 +1,4 @@
-import { userScheduleStore } from 'src/shared/storage/userScheduleStore';
+import { userScheduleStore } from 'src/shared/storage/UserScheduleStore';
 import { Course } from 'src/shared/types/Course';
 
 /**
diff --git a/src/background/lib/removeCourse.ts b/src/background/lib/removeCourse.ts
index aa8b05d3..7c73f015 100644
--- a/src/background/lib/removeCourse.ts
+++ b/src/background/lib/removeCourse.ts
@@ -1,4 +1,4 @@
-import { userScheduleStore } from 'src/shared/storage/userScheduleStore';
+import { userScheduleStore } from 'src/shared/storage/UserScheduleStore';
 import { Course } from 'src/shared/types/Course';
 
 /**
diff --git a/src/background/util/hotReloadTab.ts b/src/background/util/hotReloadTab.ts
index 54042fdc..d290accd 100644
--- a/src/background/util/hotReloadTab.ts
+++ b/src/background/util/hotReloadTab.ts
@@ -1,4 +1,4 @@
-import { devStore } from 'src/shared/storage/devStore';
+import { devStore } from 'src/shared/storage/DevStore';
 
 /**
  * A list of websites that we don't want to reload when the extension reloads (becuase it'd be hella annoying lmao)
diff --git a/src/background/util/openDebugTab.ts b/src/background/util/openDebugTab.ts
index 77ce401d..91f2aefc 100644
--- a/src/background/util/openDebugTab.ts
+++ b/src/background/util/openDebugTab.ts
@@ -1,4 +1,4 @@
-import { devStore } from 'src/shared/storage/devStore';
+import { devStore } from 'src/shared/storage/DevStore';
 
 /**
  * Open the debug tab as the first tab
diff --git a/src/debug/index.tsx b/src/debug/index.tsx
index c4c5dacc..ea020c29 100644
--- a/src/debug/index.tsx
+++ b/src/debug/index.tsx
@@ -1,7 +1,7 @@
 import './hotReload';
 import React, { useEffect } from 'react';
 import { render } from 'react-dom';
-import { devStore } from 'src/shared/storage/devStore';
+import { devStore } from 'src/shared/storage/DevStore';
 
 const manifest = chrome.runtime.getManifest();
 
diff --git a/src/shared/storage/UserScheduleStore.ts b/src/shared/storage/UserScheduleStore.ts
index 3e857b3d..cf8830bd 100644
--- a/src/shared/storage/UserScheduleStore.ts
+++ b/src/shared/storage/UserScheduleStore.ts
@@ -20,5 +20,4 @@ export const userScheduleStore = createLocalStore<IUserScheduleStore>({
     ],
 });
 
-
 debugStore({ userScheduleStore });
diff --git a/src/views/hooks/useUserSchedules.ts b/src/views/hooks/useUserSchedules.ts
index e06d855d..4f322a78 100644
--- a/src/views/hooks/useUserSchedules.ts
+++ b/src/views/hooks/useUserSchedules.ts
@@ -1,6 +1,6 @@
 import { Serialized } from 'chrome-extension-toolkit';
 import { useEffect, useState } from 'react';
-import { userScheduleStore } from 'src/shared/storage/userScheduleStore';
+import { userScheduleStore } from 'src/shared/storage/UserScheduleStore';
 import { UserSchedule } from 'src/shared/types/UserSchedule';
 
 export default function useUserSchedules(): UserSchedule[] {