diff --git a/src/App.vue b/src/App.vue
index a3dbcd59..96b8a554 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -35,7 +35,6 @@ import Notification from "@/components/Notification.vue";
 import useQStore from "@/stores/queue";
 import useShortcuts from "@/composables/useKeyboard";
 import Logo from "@/components/Logo.vue";
-import Content from "@/components/Content.vue";
 import { useRouter } from "vue-router";
 
 const context_store = useContextStore();
diff --git a/src/components/AlbumView/Header.vue b/src/components/AlbumView/Header.vue
index 3a649c21..22008810 100644
--- a/src/components/AlbumView/Header.vue
+++ b/src/components/AlbumView/Header.vue
@@ -34,15 +34,15 @@
 </template>
 
 <script setup lang="ts">
+import useVisibility from "@/composables/useVisibility";
+import useNavStore from "@/stores/nav";
+import useAlbumStore from "@/stores/pages/album";
 import { ref } from "vue";
 import { playSources } from "../../composables/enums";
 import { formatSeconds } from "../../composables/perks";
 import { paths } from "../../config";
 import { AlbumInfo } from "../../interfaces";
 import PlayBtnRect from "../shared/PlayBtnRect.vue";
-import useVisibility from "@/composables/useVisibility";
-import useNavStore from "@/stores/nav";
-import useAlbumStore from "@/stores/album";
 
 defineProps<{
   album: AlbumInfo;
diff --git a/src/components/PlaylistView/Header.vue b/src/components/PlaylistView/Header.vue
index 5f462ef2..a4e5443d 100644
--- a/src/components/PlaylistView/Header.vue
+++ b/src/components/PlaylistView/Header.vue
@@ -39,18 +39,18 @@
 </template>
 
 <script setup lang="ts">
-import { playSources, ContextSrc } from "../../composables/enums";
+import useVisibility from "@/composables/useVisibility";
+import useNavStore from "@/stores/nav";
+import usePStore from "@/stores/pages/playlist";
+import { ref } from "vue";
+import { ContextSrc, playSources } from "../../composables/enums";
+import { paths } from "../../config";
+import pContext from "../../contexts/playlist";
 import { Playlist } from "../../interfaces";
-import PlayBtnRect from "../shared/PlayBtnRect.vue";
+import useContextStore from "../../stores/context";
 import useModalStore from "../../stores/modal";
 import Option from "../shared/Option.vue";
-import pContext from "../../contexts/playlist";
-import useContextStore from "../../stores/context";
-import { paths } from "../../config";
-import usePStore from "@/stores/p.ptracks";
-import useVisibility from "@/composables/useVisibility";
-import { ref } from "vue";
-import useNavStore from "@/stores/nav";
+import PlayBtnRect from "../shared/PlayBtnRect.vue";
 
 const imguri = paths.images.playlist;
 const context = useContextStore();
diff --git a/src/components/modals/NewPlaylist.vue b/src/components/modals/NewPlaylist.vue
index 9cd9da91..6f4d2d72 100644
--- a/src/components/modals/NewPlaylist.vue
+++ b/src/components/modals/NewPlaylist.vue
@@ -21,7 +21,7 @@ import { useRoute } from "vue-router";
 import { createNewPlaylist } from "../../composables/playlists";
 import { Track } from "../../interfaces";
 import { Notification, NotifType } from "../../stores/notification";
-import usePlaylistStore from "../../stores/playlists";
+import usePlaylistStore from "@/stores/pages/playlists";
 
 const props = defineProps<{
   track?: Track;
diff --git a/src/components/modals/updatePlaylist.vue b/src/components/modals/updatePlaylist.vue
index c6c472d0..d8805060 100644
--- a/src/components/modals/updatePlaylist.vue
+++ b/src/components/modals/updatePlaylist.vue
@@ -47,10 +47,10 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref } from "vue";
-import { Playlist } from "../../interfaces";
+import usePStore from "@/stores/pages/playlist";
+import { onMounted } from "vue";
 import { updatePlaylist } from "../../composables/playlists";
-import usePStore from "../../stores/p.ptracks";
+import { Playlist } from "../../interfaces";
 
 const pStore = usePStore();
 
diff --git a/src/components/nav/Titles/APTitle.vue b/src/components/nav/Titles/APTitle.vue
index c27cd1dd..ed2204bb 100644
--- a/src/components/nav/Titles/APTitle.vue
+++ b/src/components/nav/Titles/APTitle.vue
@@ -8,14 +8,14 @@
 </template>
 
 <script setup lang="ts">
-import useAlbumStore from "@/stores/album";
-import usePStore from "@/stores/p.ptracks";
-
 import PlayBtn from "@/components/shared/PlayBtn.vue";
 import { playSources, Routes } from "@/composables/enums";
+import useAlbumStore from "@/stores/pages/album";
+import usePStore from "@/stores/pages/playlist";
 import { computed } from "@vue/reactivity";
 import { useRoute } from "vue-router";
 
+
 const things = computed(() => {
   const route = useRoute();
   let thing = {
diff --git a/src/components/shared/PlayBtn.vue b/src/components/shared/PlayBtn.vue
index de274ddb..723620aa 100644
--- a/src/components/shared/PlayBtn.vue
+++ b/src/components/shared/PlayBtn.vue
@@ -7,8 +7,8 @@
 
 <script setup lang="ts">
 import { playSources } from "@/composables/enums";
-import useAlbumStore from "@/stores/album";
-import usePlaylistStore from "@/stores/p.ptracks";
+import useAlbumStore from "@/stores/pages/album";
+import usePlaylistStore from "@/stores/pages/playlist";
 import usePlayFrom from "@/composables/usePlayFrom";
 import useQStore from "@/stores/queue";
 
diff --git a/src/components/shared/PlayBtnRect.vue b/src/components/shared/PlayBtnRect.vue
index dee50f0b..0d5f1b4f 100644
--- a/src/components/shared/PlayBtnRect.vue
+++ b/src/components/shared/PlayBtnRect.vue
@@ -11,10 +11,10 @@
 <script setup lang="ts">
 import { playSources } from "@/composables/enums";
 import usePlayFrom from "@/composables/usePlayFrom";
-import useQStore from "@/stores/queue";
 import useFStore from "@/stores/folder";
-import useAStore from "@/stores/album";
-import usePStore from "@/stores/p.ptracks";
+import useAStore from "@/stores/pages/album";
+import usePStore from "@/stores/pages/playlist";
+import useQStore from "@/stores/queue";
 
 defineProps<{
   source: playSources;
diff --git a/src/composables/usePlayFrom.ts b/src/composables/usePlayFrom.ts
index e56fd83c..23f63440 100644
--- a/src/composables/usePlayFrom.ts
+++ b/src/composables/usePlayFrom.ts
@@ -1,9 +1,9 @@
 import { playSources } from "@/composables/enums";
-
+import useAStore from "@/stores/pages/album";
+import useFStore from "@/stores/pages/folder";
+import usePStore from "@/stores/pages/playlist";
 import useQStore from "@/stores/queue";
-import useFStore from "@/stores/folder";
-import useAStore from "@/stores/album";
-import usePStore from "@/stores/p.ptracks";
+
 
 const queue = useQStore;
 const folder = useFStore;
diff --git a/src/router/index.js b/src/router/index.ts
similarity index 74%
rename from src/router/index.js
rename to src/router/index.ts
index c481e37b..a815a689 100644
--- a/src/router/index.js
+++ b/src/router/index.ts
@@ -1,20 +1,20 @@
 import { createRouter, createWebHashHistory } from "vue-router";
-import Home from "../views/Home.vue";
-import FolderView from "../views/FolderView.vue";
-import PlaylistView from "../views/PlaylistView.vue";
-import Playlists from "../views/Playlists.vue";
+import Home from "@/views/Home.vue";
+import FolderView from "@/views/FolderView.vue";
+import PlaylistView from "@/views/PlaylistView.vue";
+import Playlists from "@/views/Playlists.vue";
 
-import AlbumsExplorer from "../views/AlbumsExplorer.vue";
-import AlbumView from "../views/AlbumView.vue";
+import AlbumsExplorer from "@/views/AlbumsExplorer.vue";
+import AlbumView from "@/views/AlbumView.vue";
 
-import ArtistsExplorer from "../views/ArtistsExplorer.vue";
-import SettingsView from "../views/SettingsView.vue";
+import ArtistsExplorer from "@/views/ArtistsExplorer.vue";
+import SettingsView from "@/views/SettingsView.vue";
 
-import usePStore from "../stores/playlists";
-import usePTrackStore from "../stores/p.ptracks";
-import useFStore from "../stores/folder";
-import useAStore from "../stores/album";
-import state from "../composables/state";
+import usePStore from "@/stores/pages/playlists";
+import usePTrackStore from "@/stores/pages/playlist";
+import useFStore from "@/stores/pages/folder";
+import useAStore from "@/stores/pages/album";
+import state from "@/composables/state";
 
 const routes = [
   {
diff --git a/src/stores/album.ts b/src/stores/pages/album.ts
similarity index 92%
rename from src/stores/album.ts
rename to src/stores/pages/album.ts
index b09a2b77..7120e7fa 100644
--- a/src/stores/album.ts
+++ b/src/stores/pages/album.ts
@@ -1,10 +1,10 @@
 import { defineStore } from "pinia";
-import { Track, Artist, AlbumInfo } from "../interfaces";
+import { Track, Artist, AlbumInfo } from "../../interfaces";
 import {
   getAlbumTracks,
   getAlbumArtists,
   getAlbumBio,
-} from "../composables/album";
+} from "../../composables/album";
 
 export default defineStore("album", {
   state: () => ({
diff --git a/src/stores/folder.ts b/src/stores/pages/folder.ts
similarity index 77%
rename from src/stores/folder.ts
rename to src/stores/pages/folder.ts
index 7cc3fdf9..6cd7fc5e 100644
--- a/src/stores/folder.ts
+++ b/src/stores/pages/folder.ts
@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
-import { Folder, Track } from "../interfaces";
+import { Folder, Track } from "../../interfaces";
 
-import fetchThem from "../composables/getFilesAndFolders";
+import fetchThem from "../../composables/getFilesAndFolders";
 
 export default defineStore("FolderDirs&Tracks", {
   state: () => ({
diff --git a/src/stores/p.ptracks.ts b/src/stores/pages/playlist.ts
similarity index 86%
rename from src/stores/p.ptracks.ts
rename to src/stores/pages/playlist.ts
index b5b24325..a93c5da6 100644
--- a/src/stores/p.ptracks.ts
+++ b/src/stores/pages/playlist.ts
@@ -1,6 +1,6 @@
 import { defineStore } from "pinia";
-import { getPlaylist } from "../composables/playlists";
-import { Track, Playlist } from "../interfaces";
+import { getPlaylist } from "../../composables/playlists";
+import { Track, Playlist } from "../../interfaces";
 
 export default defineStore("playlist-tracks", {
   state: () => ({
diff --git a/src/stores/playlists.ts b/src/stores/pages/playlists.ts
similarity index 84%
rename from src/stores/playlists.ts
rename to src/stores/pages/playlists.ts
index fa63ee36..a0baabb2 100644
--- a/src/stores/playlists.ts
+++ b/src/stores/pages/playlists.ts
@@ -1,6 +1,6 @@
 import { defineStore } from "pinia";
-import { Playlist } from "../interfaces";
-import { getAllPlaylists } from "../composables/playlists";
+import { Playlist } from "../../interfaces";
+import { getAllPlaylists } from "../../composables/playlists";
 
 export default defineStore("playlists", {
   state: () => ({
diff --git a/src/views/AlbumView.vue b/src/views/AlbumView.vue
index dfc8c218..0628fdc4 100644
--- a/src/views/AlbumView.vue
+++ b/src/views/AlbumView.vue
@@ -23,7 +23,7 @@ import AlbumBio from "../components/AlbumView/AlbumBio.vue";
 import SongList from "../components/FolderView/SongList.vue";
 import FeaturedArtists from "../components/PlaylistView/FeaturedArtists.vue";
 
-import useAStore from "../stores/album";
+import useAStore from "../stores/pages/album";
 import { onBeforeRouteUpdate } from "vue-router";
 
 const album = useAStore();
diff --git a/src/views/FolderView.vue b/src/views/FolderView.vue
index ccf6da46..ffe10387 100644
--- a/src/views/FolderView.vue
+++ b/src/views/FolderView.vue
@@ -7,14 +7,14 @@
   </div>
 </template>
 
-<script setup>
+<script setup lang="ts">
 import { ref } from "@vue/reactivity";
 import { onBeforeRouteUpdate } from "vue-router";
 
 import SongList from "@/components/FolderView/SongList.vue";
 import FolderList from "@/components/FolderView/FolderList.vue";
 
-import useFStore from "../stores/folder";
+import useFStore from "../stores/pages/folder";
 import useLoaderStore from "../stores/loader";
 
 const loader = useLoaderStore();
@@ -24,7 +24,7 @@ const scrollable = ref(null);
 
 onBeforeRouteUpdate((to) => {
   loader.startLoading();
-  FStore.fetchAll(to.params.path)
+  FStore.fetchAll(to.params.path as string)
     .then(() => {
       scrollable.value.scrollTop = 0;
     })
diff --git a/src/views/PlaylistView.vue b/src/views/PlaylistView.vue
index 285645ec..bc2c58f6 100644
--- a/src/views/PlaylistView.vue
+++ b/src/views/PlaylistView.vue
@@ -28,10 +28,10 @@
 </template>
 
 <script setup lang="ts">
-import Header from "../components/PlaylistView/Header.vue";
-import SongList from "../components/FolderView/SongList.vue";
-import FeaturedArtists from "../components/PlaylistView/FeaturedArtists.vue";
-import usePTrackStore from "../stores/p.ptracks";
+import Header from "@/components/PlaylistView/Header.vue";
+import SongList from "@/components/FolderView/SongList.vue";
+import FeaturedArtists from "@/components/PlaylistView/FeaturedArtists.vue";
+import usePTrackStore from "@/stores/pages/playlist";
 
 const playlist = usePTrackStore();
 </script>
diff --git a/src/views/Playlists.vue b/src/views/Playlists.vue
index 834fcd1b..9e999ddd 100644
--- a/src/views/Playlists.vue
+++ b/src/views/Playlists.vue
@@ -12,10 +12,10 @@
 </template>
 
 <script setup lang="ts">
-import PlaylistCard from "../components/playlists/PlaylistCard.vue";
+import PlaylistCard from "@/components/playlists/PlaylistCard.vue";
 
-import usePStore from "../stores/playlists";
-import NewPlaylistCard from "../components/playlists/NewPlaylistCard.vue";
+import usePStore from "@/stores/pages/playlists";
+import NewPlaylistCard from "@/components/playlists/NewPlaylistCard.vue";
 const pStore = usePStore();
 </script>