diff --git a/materialious/src/lib/components/Settings/About.svelte b/materialious/src/lib/components/settings/About.svelte
similarity index 100%
rename from materialious/src/lib/components/Settings/About.svelte
rename to materialious/src/lib/components/settings/About.svelte
diff --git a/materialious/src/lib/components/Settings/ApiExtended.svelte b/materialious/src/lib/components/settings/ApiExtended.svelte
similarity index 100%
rename from materialious/src/lib/components/Settings/ApiExtended.svelte
rename to materialious/src/lib/components/settings/ApiExtended.svelte
diff --git a/materialious/src/lib/components/Settings/DeArrow.svelte b/materialious/src/lib/components/settings/DeArrow.svelte
similarity index 100%
rename from materialious/src/lib/components/Settings/DeArrow.svelte
rename to materialious/src/lib/components/settings/DeArrow.svelte
diff --git a/materialious/src/lib/components/Settings/Interface.svelte b/materialious/src/lib/components/settings/Interface.svelte
similarity index 100%
rename from materialious/src/lib/components/Settings/Interface.svelte
rename to materialious/src/lib/components/settings/Interface.svelte
diff --git a/materialious/src/lib/components/Settings/Player.svelte b/materialious/src/lib/components/settings/Player.svelte
similarity index 100%
rename from materialious/src/lib/components/Settings/Player.svelte
rename to materialious/src/lib/components/settings/Player.svelte
diff --git a/materialious/src/lib/components/Settings/RYD.svelte b/materialious/src/lib/components/settings/RYD.svelte
similarity index 100%
rename from materialious/src/lib/components/Settings/RYD.svelte
rename to materialious/src/lib/components/settings/RYD.svelte
diff --git a/materialious/src/lib/components/Settings/Settings.svelte b/materialious/src/lib/components/settings/Settings.svelte
similarity index 100%
rename from materialious/src/lib/components/Settings/Settings.svelte
rename to materialious/src/lib/components/settings/Settings.svelte
diff --git a/materialious/src/lib/components/Settings/SponsorBlock.svelte b/materialious/src/lib/components/settings/SponsorBlock.svelte
similarity index 100%
rename from materialious/src/lib/components/Settings/SponsorBlock.svelte
rename to materialious/src/lib/components/settings/SponsorBlock.svelte
diff --git a/materialious/src/lib/components/Watch/Author.svelte b/materialious/src/lib/components/watch/Author.svelte
similarity index 100%
rename from materialious/src/lib/components/Watch/Author.svelte
rename to materialious/src/lib/components/watch/Author.svelte
diff --git a/materialious/src/lib/components/Comment.svelte b/materialious/src/lib/components/watch/Comment.svelte
similarity index 100%
rename from materialious/src/lib/components/Comment.svelte
rename to materialious/src/lib/components/watch/Comment.svelte
diff --git a/materialious/src/lib/components/Watch/Description.svelte b/materialious/src/lib/components/watch/Description.svelte
similarity index 100%
rename from materialious/src/lib/components/Watch/Description.svelte
rename to materialious/src/lib/components/watch/Description.svelte
diff --git a/materialious/src/lib/components/Watch/LikesDislikes.svelte b/materialious/src/lib/components/watch/LikesDislikes.svelte
similarity index 100%
rename from materialious/src/lib/components/Watch/LikesDislikes.svelte
rename to materialious/src/lib/components/watch/LikesDislikes.svelte
diff --git a/materialious/src/lib/patches/youtubejs.ts b/materialious/src/lib/patches/youtubejs.ts
index 479e3b51..341e23e0 100644
--- a/materialious/src/lib/patches/youtubejs.ts
+++ b/materialious/src/lib/patches/youtubejs.ts
@@ -153,6 +153,8 @@ export async function patchYoutubeJs(videoId: string): Promise<VideoPlay> {
 			return;
 		}
 
+		console.log(recommended);
+
 		recommendedVideos.push({
 			videoThumbnails: (recommended?.content_image?.image as Thumbnail[]) || [],
 			videoId: recommended?.content_id || '',
diff --git a/materialious/src/routes/(app)/+layout.svelte b/materialious/src/routes/(app)/+layout.svelte
index 6d0dbf44..bef93813 100644
--- a/materialious/src/routes/(app)/+layout.svelte
+++ b/materialious/src/routes/(app)/+layout.svelte
@@ -9,7 +9,7 @@
 	import Logo from '$lib/components/Logo.svelte';
 	import PageLoading from '$lib/components/PageLoading.svelte';
 	import Search from '$lib/components/Search.svelte';
-	import Settings from '$lib/components/Settings/Settings.svelte';
+	import Settings from '$lib/components/settings/Settings.svelte';
 	import SyncParty from '$lib/components/SyncParty.svelte';
 	import Thumbnail from '$lib/components/Thumbnail.svelte';
 	import '$lib/css/global.css';
diff --git a/materialious/src/routes/(app)/hashtag/[slug]/+page.svelte b/materialious/src/routes/(app)/hashtag/[slug]/+page.svelte
index 70eb1740..d21b4481 100644
--- a/materialious/src/routes/(app)/hashtag/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/hashtag/[slug]/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { getHashtag } from '$lib/api';
-	import type { Video } from '$lib/api/model.js';
+	import type { Video } from '$lib/api/model';
 	import ItemsList from '$lib/components/ItemsList.svelte';
 	import { onMount } from 'svelte';
 	import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading';
diff --git a/materialious/src/routes/(app)/playlist/[slug]/+page.ts b/materialious/src/routes/(app)/playlist/[slug]/+page.ts
index 20422000..6295325a 100644
--- a/materialious/src/routes/(app)/playlist/[slug]/+page.ts
+++ b/materialious/src/routes/(app)/playlist/[slug]/+page.ts
@@ -1,4 +1,4 @@
-import { loadEntirePlaylist } from '$lib/playlist.js';
+import { loadEntirePlaylist } from '$lib/playlist';
 import { error } from '@sveltejs/kit';
 
 export async function load({ params }) {
diff --git a/materialious/src/routes/(app)/search/[slug]/+page.svelte b/materialious/src/routes/(app)/search/[slug]/+page.svelte
index d73e73e4..2bb2a709 100644
--- a/materialious/src/routes/(app)/search/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/search/[slug]/+page.svelte
@@ -6,8 +6,8 @@
 	import PageLoading from '$lib/components/PageLoading.svelte';
 	import PlaylistThumbnail from '$lib/components/PlaylistThumbnail.svelte';
 	import Thumbnail from '$lib/components/Thumbnail.svelte';
-	import { extractUniqueId } from '$lib/misc.js';
-	import { feedLastItemId, searchCacheStore } from '$lib/store.js';
+	import { extractUniqueId } from '$lib/misc';
+	import { feedLastItemId, searchCacheStore } from '$lib/store';
 	import { onMount } from 'svelte';
 	import { _ } from '$lib/i18n';
 	import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading';
diff --git a/materialious/src/routes/(app)/search/[slug]/+page.ts b/materialious/src/routes/(app)/search/[slug]/+page.ts
index 7a120b98..c7565a4e 100644
--- a/materialious/src/routes/(app)/search/[slug]/+page.ts
+++ b/materialious/src/routes/(app)/search/[slug]/+page.ts
@@ -1,7 +1,7 @@
 import { getSearch } from '$lib/api/index';
 import type { Channel, HashTag, Playlist, Video } from '$lib/api/model';
-import { excludeDuplicateFeeds } from '$lib/misc.js';
-import { searchCacheStore } from '$lib/store.js';
+import { excludeDuplicateFeeds } from '$lib/misc';
+import { searchCacheStore } from '$lib/store';
 import { error } from '@sveltejs/kit';
 import { get } from 'svelte/store';
 
diff --git a/materialious/src/routes/(app)/subscriptions/+page.svelte b/materialious/src/routes/(app)/subscriptions/+page.svelte
index b012c6bb..1c785ec7 100644
--- a/materialious/src/routes/(app)/subscriptions/+page.svelte
+++ b/materialious/src/routes/(app)/subscriptions/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { getFeed } from '$lib/api/index';
-	import type { PlaylistPageVideo, Video, VideoBase } from '$lib/api/model.js';
+	import type { PlaylistPageVideo, Video, VideoBase } from '$lib/api/model';
 	import { feedCacheStore } from '$lib/store';
 	import { _ } from '$lib/i18n';
 	import InfiniteLoading, { type InfiniteEvent } from 'svelte-infinite-loading';
diff --git a/materialious/src/routes/(app)/watch/[slug]/+page.svelte b/materialious/src/routes/(app)/watch/[slug]/+page.svelte
index df5d116d..c2b8c724 100644
--- a/materialious/src/routes/(app)/watch/[slug]/+page.svelte
+++ b/materialious/src/routes/(app)/watch/[slug]/+page.svelte
@@ -6,7 +6,6 @@
 		removePlaylistVideo
 	} from '$lib/api/index';
 	import type { Comments, PlaylistPage } from '$lib/api/model';
-	import Comment from '$lib/components/Comment.svelte';
 	import Player from '$lib/components/Player.svelte';
 	import ShareVideo from '$lib/components/ShareVideo.svelte';
 	import Thumbnail from '$lib/components/Thumbnail.svelte';
@@ -14,7 +13,7 @@
 	import { getBestThumbnail } from '$lib/images';
 	import { letterCase } from '$lib/letterCasing';
 	import { cleanNumber, humanizeSeconds, numberWithCommas } from '$lib/numbers';
-	import type { PlayerEvents } from '$lib/player.js';
+	import type { PlayerEvents } from '$lib/player';
 	import {
 		authStore,
 		interfaceAutoExpandChapters,
@@ -31,11 +30,12 @@
 	import { onDestroy, onMount, tick } from 'svelte';
 	import { _ } from '$lib/i18n';
 	import { get } from 'svelte/store';
-	import { loadEntirePlaylist } from '$lib/playlist.js';
-	import Author from '$lib/components/Watch/Author.svelte';
-	import Description from '$lib/components/Watch/Description.svelte';
-	import { expandSummery } from '$lib/misc.js';
-	import LikesDislikes from '$lib/components/Watch/LikesDislikes.svelte';
+	import { loadEntirePlaylist } from '$lib/playlist';
+	import Author from '$lib/components/watch/Author.svelte';
+	import Description from '$lib/components/watch/Description.svelte';
+	import LikesDislikes from '$lib/components/watch/LikesDislikes.svelte';
+	import Comment from '$lib/components/watch/Comment.svelte';
+	import { expandSummery } from '$lib/misc';
 
 	let { data = $bindable() } = $props();
 
diff --git a/materialious/src/routes/(app)/watch/[slug]/+page.ts b/materialious/src/routes/(app)/watch/[slug]/+page.ts
index ddb95130..e471e17f 100644
--- a/materialious/src/routes/(app)/watch/[slug]/+page.ts
+++ b/materialious/src/routes/(app)/watch/[slug]/+page.ts
@@ -1,4 +1,4 @@
-import { getWatchDetails } from '$lib/watch.js';
+import { getWatchDetails } from '$lib/watch';
 
 export async function load({ params, url }) {
 	return getWatchDetails(params.slug, url);
diff --git a/materialious/src/routes/(no-layout)/tv/[slug]/+page.svelte b/materialious/src/routes/(no-layout)/tv/[slug]/+page.svelte
index 1652abe0..76ae315b 100644
--- a/materialious/src/routes/(no-layout)/tv/[slug]/+page.svelte
+++ b/materialious/src/routes/(no-layout)/tv/[slug]/+page.svelte
@@ -1,15 +1,14 @@
 <script lang="ts">
 	import ContentColumn from '$lib/components/ContentColumn.svelte';
 	import Player from '$lib/components/Player.svelte';
-	import Thumbnail from '$lib/components/Thumbnail.svelte';
-	import Author from '$lib/components/Watch/Author.svelte';
-	import Description from '$lib/components/Watch/Description.svelte';
-	import LikesDislikes from '$lib/components/Watch/LikesDislikes.svelte';
-	import { letterCase } from '$lib/letterCasing.js';
+	import Author from '$lib/components/watch/Author.svelte';
+	import Description from '$lib/components/watch/Description.svelte';
+	import LikesDislikes from '$lib/components/watch/LikesDislikes.svelte';
+	import { letterCase } from '$lib/letterCasing';
 	import Mousetrap from 'mousetrap';
 	import { onDestroy, onMount, tick } from 'svelte';
 	import { _ } from '$lib/i18n';
-	import { playlistCacheStore } from '$lib/store.js';
+	import { playlistCacheStore } from '$lib/store';
 	import { fade } from 'svelte/transition';
 	import ItemsList from '$lib/components/ItemsList.svelte';
 
diff --git a/materialious/src/routes/(no-layout)/tv/[slug]/+page.ts b/materialious/src/routes/(no-layout)/tv/[slug]/+page.ts
index c9eb4ce9..57c51522 100644
--- a/materialious/src/routes/(no-layout)/tv/[slug]/+page.ts
+++ b/materialious/src/routes/(no-layout)/tv/[slug]/+page.ts
@@ -1,5 +1,5 @@
-import { isTvRouteLoading } from '$lib/store.js';
-import { getWatchDetails } from '$lib/watch.js';
+import { isTvRouteLoading } from '$lib/store';
+import { getWatchDetails } from '$lib/watch';
 
 export async function load({ params, url }) {
 	isTvRouteLoading.set(true);
diff --git a/materialious/src/routes/+layout.ts b/materialious/src/routes/+layout.ts
index 9cc9c450..f6b3f868 100644
--- a/materialious/src/routes/+layout.ts
+++ b/materialious/src/routes/+layout.ts
@@ -4,8 +4,8 @@ import androidTv from '$lib/android/plugins/androidTv';
 import { getResolveUrl } from '$lib/api';
 import '$lib/i18n'; // Import to initialize. Important :)
 import { initI18n } from '$lib/i18n';
-import { getPages } from '$lib/navPages.js';
-import { authStore, interfaceDefaultPage, isAndroidTvStore } from '$lib/store.js';
+import { getPages } from '$lib/navPages';
+import { authStore, interfaceDefaultPage, isAndroidTvStore } from '$lib/store';
 import { get } from 'svelte/store';
 
 export const ssr = false;