diff --git a/frontend/src/components/About.tsx b/frontend/src/About.tsx
similarity index 100%
rename from frontend/src/components/About.tsx
rename to frontend/src/About.tsx
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index dc71e004..a91b5c00 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -1,11 +1,11 @@
 import { Routes, Route } from 'react-router-dom';
-import Navigation from './components/Navigation';
-import Conversation from './components/Conversation/Conversation';
-import APIKeyModal from './components/APIKeyModal';
-import About from './components/About';
+import Navigation from './Navigation';
+import Conversation from './conversation/Conversation';
+import APIKeyModal from './preferences/APIKeyModal';
+import About from './About';
 import { useState } from 'react';
 import { ActiveState } from './models/misc';
-import { selectApiKeyStatus } from './store';
+import { selectApiKeyStatus } from './preferences/preferenceSlice';
 import { useSelector } from 'react-redux';
 
 export default function App() {
diff --git a/frontend/src/components/Navigation.tsx b/frontend/src/Navigation.tsx
similarity index 88%
rename from frontend/src/components/Navigation.tsx
rename to frontend/src/Navigation.tsx
index c895a673..cde5accb 100644
--- a/frontend/src/components/Navigation.tsx
+++ b/frontend/src/Navigation.tsx
@@ -1,14 +1,10 @@
-import { useDispatch, useSelector } from 'react-redux';
 import { NavLink } from 'react-router-dom';
-import { useMediaQuery } from '../hooks';
-import { toggleApiKeyModal } from '../store';
-import Arrow1 from '../imgs/arrow.svg';
-import Hamburger from '../imgs/hamburger.svg';
-import Key from '../imgs/key.svg';
-import Info from '../imgs/info.svg';
-import Link from '../imgs/link.svg';
-import Exit from '../imgs/exit.svg';
-import { ActiveState } from '../models/misc';
+import Arrow1 from './assets/arrow.svg';
+import Hamburger from './assets/hamburger.svg';
+import Key from './assets/key.svg';
+import Info from './assets/info.svg';
+import Link from './assets/link.svg';
+import { ActiveState } from './models/misc';
 
 //TODO - Need to replace Chat button to open secondary nav with scrollable past chats option and new chat at top
 //TODO - Need to add Discord and Github links
diff --git a/frontend/src/imgs/arrow.svg b/frontend/src/assets/arrow.svg
similarity index 100%
rename from frontend/src/imgs/arrow.svg
rename to frontend/src/assets/arrow.svg
diff --git a/frontend/src/imgs/exit.svg b/frontend/src/assets/exit.svg
similarity index 100%
rename from frontend/src/imgs/exit.svg
rename to frontend/src/assets/exit.svg
diff --git a/frontend/src/imgs/hamburger.svg b/frontend/src/assets/hamburger.svg
similarity index 100%
rename from frontend/src/imgs/hamburger.svg
rename to frontend/src/assets/hamburger.svg
diff --git a/frontend/src/imgs/info.svg b/frontend/src/assets/info.svg
similarity index 100%
rename from frontend/src/imgs/info.svg
rename to frontend/src/assets/info.svg
diff --git a/frontend/src/imgs/key.svg b/frontend/src/assets/key.svg
similarity index 100%
rename from frontend/src/imgs/key.svg
rename to frontend/src/assets/key.svg
diff --git a/frontend/src/imgs/link.svg b/frontend/src/assets/link.svg
similarity index 100%
rename from frontend/src/imgs/link.svg
rename to frontend/src/assets/link.svg
diff --git a/frontend/src/components/Conversation/Conversation.tsx b/frontend/src/conversation/Conversation.tsx
similarity index 100%
rename from frontend/src/components/Conversation/Conversation.tsx
rename to frontend/src/conversation/Conversation.tsx
diff --git a/frontend/src/hooks.ts b/frontend/src/hooks.ts
deleted file mode 100644
index 45bfb83e..00000000
--- a/frontend/src/hooks.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { useState, useEffect } from 'react';
-
-export function useMediaQuery(query: string): boolean {
-  const [matches, setMatches] = useState(false);
-
-  useEffect(() => {
-    const media = window.matchMedia(query);
-
-    if (media.matches !== matches) {
-      setMatches(media.matches);
-    }
-
-    const listener = () => {
-      setMatches(media.matches);
-    };
-
-    media.addEventListener('resize', listener);
-    return () => media.removeEventListener('resize', listener);
-  }, [matches, query]);
-
-  return matches;
-}
diff --git a/frontend/src/components/APIKeyModal.tsx b/frontend/src/preferences/APIKeyModal.tsx
similarity index 98%
rename from frontend/src/components/APIKeyModal.tsx
rename to frontend/src/preferences/APIKeyModal.tsx
index 41b4c166..b440500a 100644
--- a/frontend/src/components/APIKeyModal.tsx
+++ b/frontend/src/preferences/APIKeyModal.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { ActiveState } from '../models/misc';
-import { setApiKey } from '../store';
+import { setApiKey } from './preferenceSlice';
 
 export default function APIKeyModal({
   modalState,
diff --git a/frontend/src/preferences/preferenceSlice.ts b/frontend/src/preferences/preferenceSlice.ts
new file mode 100644
index 00000000..6121f9d9
--- /dev/null
+++ b/frontend/src/preferences/preferenceSlice.ts
@@ -0,0 +1,29 @@
+import { createSlice } from '@reduxjs/toolkit';
+import store from '../store';
+
+interface Preference {
+  apiKey: string;
+}
+
+const initialState: Preference = {
+  apiKey: '',
+};
+
+export const prefSlice = createSlice({
+  name: 'preference',
+  initialState,
+  reducers: {
+    setApiKey: (state, action) => {
+      state.apiKey = action.payload;
+    },
+  },
+});
+
+export const { setApiKey } = prefSlice.actions;
+export default prefSlice.reducer;
+
+type RootState = ReturnType<typeof store.getState>;
+
+export const selectApiKey = (state: RootState) => state.preference.apiKey;
+export const selectApiKeyStatus = (state: RootState) =>
+  !!state.preference.apiKey;
diff --git a/frontend/src/store.ts b/frontend/src/store.ts
index d3d3c177..706e2ee4 100644
--- a/frontend/src/store.ts
+++ b/frontend/src/store.ts
@@ -1,48 +1,12 @@
-import {
-  configureStore,
-  createSelector,
-  createSlice,
-  PayloadAction,
-} from '@reduxjs/toolkit';
+// import { configureStore, createSlice } from '@reduxjs/toolkit';
 
-interface State {
-  isApiKeyModalOpen: boolean;
-  apiKey: string;
-}
-
-const initialState: State = {
-  isApiKeyModalOpen: false,
-  apiKey: '',
-};
-
-export const slice = createSlice({
-  name: 'app',
-  initialState,
-  reducers: {
-    toggleApiKeyModal: (state) => {
-      state.isApiKeyModalOpen = !state.isApiKeyModalOpen;
-      console.log('showApiKeyModal', state.isApiKeyModalOpen);
-    },
-    setApiKey: (state, action: PayloadAction<string>) => {
-      state.apiKey = action.payload;
-      console.log('setApiKey', action.payload);
-    },
-  },
-});
-
-export const { toggleApiKeyModal, setApiKey } = slice.actions;
+import { configureStore } from '@reduxjs/toolkit';
+import { prefSlice } from './preferences/preferenceSlice';
 
 const store = configureStore({
   reducer: {
-    app: slice.reducer,
+    preference: prefSlice.reducer,
   },
 });
 
-type RootState = ReturnType<typeof store.getState>;
-
-export const selectIsApiKeyModalOpen = (state: RootState) =>
-  state.app.isApiKeyModalOpen;
-export const selectApiKey = (state: RootState) => state.app.apiKey;
-export const selectApiKeyStatus = (state: RootState) => !!state.app.apiKey;
-
 export default store;