diff --git a/packages/app/src/Element/AppleMusicEmbed.tsx b/packages/app/src/Element/Embed/AppleMusicEmbed.tsx
similarity index 100%
rename from packages/app/src/Element/AppleMusicEmbed.tsx
rename to packages/app/src/Element/Embed/AppleMusicEmbed.tsx
diff --git a/packages/app/src/Element/CashuNuts.css b/packages/app/src/Element/Embed/CashuNuts.css
similarity index 100%
rename from packages/app/src/Element/CashuNuts.css
rename to packages/app/src/Element/Embed/CashuNuts.css
diff --git a/packages/app/src/Element/CashuNuts.tsx b/packages/app/src/Element/Embed/CashuNuts.tsx
similarity index 100%
rename from packages/app/src/Element/CashuNuts.tsx
rename to packages/app/src/Element/Embed/CashuNuts.tsx
diff --git a/packages/app/src/Element/LinkPreview.css b/packages/app/src/Element/Embed/LinkPreview.css
similarity index 100%
rename from packages/app/src/Element/LinkPreview.css
rename to packages/app/src/Element/Embed/LinkPreview.css
diff --git a/packages/app/src/Element/LinkPreview.tsx b/packages/app/src/Element/Embed/LinkPreview.tsx
similarity index 98%
rename from packages/app/src/Element/LinkPreview.tsx
rename to packages/app/src/Element/Embed/LinkPreview.tsx
index cb453446..5c8fb5a3 100644
--- a/packages/app/src/Element/LinkPreview.tsx
+++ b/packages/app/src/Element/Embed/LinkPreview.tsx
@@ -4,7 +4,7 @@ import { CSSProperties, useEffect, useState } from "react";
 import Spinner from "Icons/Spinner";
 import SnortApi, { LinkPreviewData } from "SnortApi";
 import useImgProxy from "Hooks/useImgProxy";
-import { MediaElement } from "Element/MediaElement";
+import { MediaElement } from "Element/Embed/MediaElement";
 
 async function fetchUrlPreviewInfo(url: string) {
   const api = new SnortApi();
diff --git a/packages/app/src/Element/MagnetLink.tsx b/packages/app/src/Element/Embed/MagnetLink.tsx
similarity index 100%
rename from packages/app/src/Element/MagnetLink.tsx
rename to packages/app/src/Element/Embed/MagnetLink.tsx
diff --git a/packages/app/src/Element/MediaElement.tsx b/packages/app/src/Element/Embed/MediaElement.tsx
similarity index 100%
rename from packages/app/src/Element/MediaElement.tsx
rename to packages/app/src/Element/Embed/MediaElement.tsx
diff --git a/packages/app/src/Element/Mention.tsx b/packages/app/src/Element/Embed/Mention.tsx
similarity index 100%
rename from packages/app/src/Element/Mention.tsx
rename to packages/app/src/Element/Embed/Mention.tsx
diff --git a/packages/app/src/Element/MixCloudEmbed.tsx b/packages/app/src/Element/Embed/MixCloudEmbed.tsx
similarity index 100%
rename from packages/app/src/Element/MixCloudEmbed.tsx
rename to packages/app/src/Element/Embed/MixCloudEmbed.tsx
diff --git a/packages/app/src/Element/NostrLink.tsx b/packages/app/src/Element/Embed/NostrLink.tsx
similarity index 95%
rename from packages/app/src/Element/NostrLink.tsx
rename to packages/app/src/Element/Embed/NostrLink.tsx
index bbbdbb6a..810a400c 100644
--- a/packages/app/src/Element/NostrLink.tsx
+++ b/packages/app/src/Element/Embed/NostrLink.tsx
@@ -1,7 +1,7 @@
 import { Link } from "react-router-dom";
 import { NostrPrefix, tryParseNostrLink } from "@snort/system";
 
-import Mention from "Element/Mention";
+import Mention from "Element/Embed/Mention";
 import NoteQuote from "Element/NoteQuote";
 
 export default function NostrLink({ link, depth }: { link: string; depth?: number }) {
diff --git a/packages/app/src/Element/NostrNestsEmbed.tsx b/packages/app/src/Element/Embed/NostrNestsEmbed.tsx
similarity index 100%
rename from packages/app/src/Element/NostrNestsEmbed.tsx
rename to packages/app/src/Element/Embed/NostrNestsEmbed.tsx
diff --git a/packages/app/src/Element/SoundCloudEmded.tsx b/packages/app/src/Element/Embed/SoundCloudEmded.tsx
similarity index 100%
rename from packages/app/src/Element/SoundCloudEmded.tsx
rename to packages/app/src/Element/Embed/SoundCloudEmded.tsx
diff --git a/packages/app/src/Element/SpotifyEmbed.tsx b/packages/app/src/Element/Embed/SpotifyEmbed.tsx
similarity index 100%
rename from packages/app/src/Element/SpotifyEmbed.tsx
rename to packages/app/src/Element/Embed/SpotifyEmbed.tsx
diff --git a/packages/app/src/Element/TidalEmbed.tsx b/packages/app/src/Element/Embed/TidalEmbed.tsx
similarity index 100%
rename from packages/app/src/Element/TidalEmbed.tsx
rename to packages/app/src/Element/Embed/TidalEmbed.tsx
diff --git a/packages/app/src/Element/TwitchEmbed.tsx b/packages/app/src/Element/Embed/TwitchEmbed.tsx
similarity index 100%
rename from packages/app/src/Element/TwitchEmbed.tsx
rename to packages/app/src/Element/Embed/TwitchEmbed.tsx
diff --git a/packages/app/src/Element/WavlakeEmbed.tsx b/packages/app/src/Element/Embed/WavlakeEmbed.tsx
similarity index 100%
rename from packages/app/src/Element/WavlakeEmbed.tsx
rename to packages/app/src/Element/Embed/WavlakeEmbed.tsx
diff --git a/packages/app/src/Element/ZapstrEmbed.css b/packages/app/src/Element/Embed/ZapstrEmbed.css
similarity index 100%
rename from packages/app/src/Element/ZapstrEmbed.css
rename to packages/app/src/Element/Embed/ZapstrEmbed.css
diff --git a/packages/app/src/Element/ZapstrEmbed.tsx b/packages/app/src/Element/Embed/ZapstrEmbed.tsx
similarity index 100%
rename from packages/app/src/Element/ZapstrEmbed.tsx
rename to packages/app/src/Element/Embed/ZapstrEmbed.tsx
diff --git a/packages/app/src/Element/HyperText.tsx b/packages/app/src/Element/HyperText.tsx
index 22ddebd9..83c6e5a5 100644
--- a/packages/app/src/Element/HyperText.tsx
+++ b/packages/app/src/Element/HyperText.tsx
@@ -13,16 +13,16 @@ import {
   WavlakeRegex,
 } from "Const";
 import { magnetURIDecode } from "SnortUtils";
-import SoundCloudEmbed from "Element/SoundCloudEmded";
-import MixCloudEmbed from "Element/MixCloudEmbed";
-import SpotifyEmbed from "Element/SpotifyEmbed";
-import TidalEmbed from "Element/TidalEmbed";
-import TwitchEmbed from "Element/TwitchEmbed";
-import AppleMusicEmbed from "Element/AppleMusicEmbed";
-import WavlakeEmbed from "Element/WavlakeEmbed";
-import LinkPreview from "Element/LinkPreview";
-import NostrLink from "Element/NostrLink";
-import MagnetLink from "Element/MagnetLink";
+import SoundCloudEmbed from "Element/Embed/SoundCloudEmded";
+import MixCloudEmbed from "Element/Embed/MixCloudEmbed";
+import SpotifyEmbed from "Element/Embed/SpotifyEmbed";
+import TidalEmbed from "Element/Embed/TidalEmbed";
+import TwitchEmbed from "Element/Embed/TwitchEmbed";
+import AppleMusicEmbed from "Element/Embed/AppleMusicEmbed";
+import WavlakeEmbed from "Element/Embed/WavlakeEmbed";
+import LinkPreview from "Element/Embed/LinkPreview";
+import NostrLink from "Element/Embed/NostrLink";
+import MagnetLink from "Element/Embed/MagnetLink";
 
 interface HypeTextProps {
   link: string;
diff --git a/packages/app/src/Element/NostrFileHeader.tsx b/packages/app/src/Element/NostrFileHeader.tsx
index 09be6b38..080ae1a0 100644
--- a/packages/app/src/Element/NostrFileHeader.tsx
+++ b/packages/app/src/Element/NostrFileHeader.tsx
@@ -5,7 +5,7 @@ import { findTag } from "SnortUtils";
 import { useEventFeed } from "Feed/EventFeed";
 import PageSpinner from "Element/PageSpinner";
 import Reveal from "Element/Reveal";
-import { MediaElement } from "Element/MediaElement";
+import { MediaElement } from "Element/Embed/MediaElement";
 
 export default function NostrFileHeader({ link }: { link: NostrLink }) {
   const ev = useEventFeed(link);
diff --git a/packages/app/src/Element/Note.tsx b/packages/app/src/Element/Note.tsx
index 7081125a..d424064a 100644
--- a/packages/app/src/Element/Note.tsx
+++ b/packages/app/src/Element/Note.tsx
@@ -29,7 +29,7 @@ import Poll from "Element/Poll";
 import useLogin from "Hooks/useLogin";
 import { setBookmarked, setPinned } from "Login";
 import { NostrFileElement } from "Element/NostrFileHeader";
-import ZapstrEmbed from "Element/ZapstrEmbed";
+import ZapstrEmbed from "Element/Embed/ZapstrEmbed";
 import PubkeyList from "Element/PubkeyList";
 import { LiveEvent } from "Element/LiveEvent";
 import { NoteContextMenu, NoteTranslation } from "Element/NoteContextMenu";
diff --git a/packages/app/src/Element/RevealMedia.tsx b/packages/app/src/Element/RevealMedia.tsx
index 9be7c627..30742385 100644
--- a/packages/app/src/Element/RevealMedia.tsx
+++ b/packages/app/src/Element/RevealMedia.tsx
@@ -3,7 +3,7 @@ import FormattedMessage from "Element/FormattedMessage";
 import { FileExtensionRegex } from "Const";
 import Reveal from "Element/Reveal";
 import useLogin from "Hooks/useLogin";
-import { MediaElement } from "Element/MediaElement";
+import { MediaElement } from "Element/Embed/MediaElement";
 import { Link } from "react-router-dom";
 
 interface RevealMediaProps {
diff --git a/packages/app/src/Element/Text.tsx b/packages/app/src/Element/Text.tsx
index 852bb470..18ad96b8 100644
--- a/packages/app/src/Element/Text.tsx
+++ b/packages/app/src/Element/Text.tsx
@@ -5,7 +5,7 @@ import { HexKey, ParsedFragment } from "@snort/system";
 import Invoice from "Element/Invoice";
 import Hashtag from "Element/Hashtag";
 import HyperText from "Element/HyperText";
-import CashuNuts from "Element/CashuNuts";
+import CashuNuts from "Element/Embed/CashuNuts";
 import RevealMedia from "./RevealMedia";
 import { ProxyImg } from "./ProxyImg";
 import { SpotlightMediaModal } from "./SpotlightMedia";