diff --git a/app.vue b/app.vue
index c6db309..9aeae9d 100644
--- a/app.vue
+++ b/app.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script lang="ts" setup>
-import ContextMenu from '~/components/UserInterface/ContextMenu.vue';
+import ContextMenu from '~/components/ContextMenu.vue';
 import { render } from 'vue';
 
 const banner = useState("banner", () => false);
diff --git a/components/UserInterface/ContextMenu.vue b/components/ContextMenu.vue
similarity index 100%
rename from components/UserInterface/ContextMenu.vue
rename to components/ContextMenu.vue
diff --git a/components/Guild/GuildDropdown.vue b/components/Dropdown.vue
similarity index 100%
rename from components/Guild/GuildDropdown.vue
rename to components/Dropdown.vue
diff --git a/components/Guild/GuildOptionsMenu.vue b/components/GuildOptionsMenu.vue
similarity index 95%
rename from components/Guild/GuildOptionsMenu.vue
rename to components/GuildOptionsMenu.vue
index 86fdaf4..e9bbcf9 100644
--- a/components/Guild/GuildOptionsMenu.vue
+++ b/components/GuildOptionsMenu.vue
@@ -8,7 +8,7 @@
 
 <script lang="ts" setup>
 import { render } from 'vue';
-import InviteModal from '../Modals/InviteModal.vue';
+import InviteModal from './InviteModal.vue';
 
 const settings = [
   { name: "Invite", icon: "lucide:letter", action: openInviteModal }
diff --git a/components/Modals/InviteModal.vue b/components/InviteModal.vue
similarity index 96%
rename from components/Modals/InviteModal.vue
rename to components/InviteModal.vue
index 9c26bc2..d532ae3 100644
--- a/components/Modals/InviteModal.vue
+++ b/components/InviteModal.vue
@@ -15,7 +15,7 @@
 
 <script lang="ts" setup>
 import type { InviteResponse, ModalProps } from '~/types/interfaces';
-import Button from '~/components/UserInterface/Button.vue';
+import Button from './UserInterface/Button.vue';
 
 const props = defineProps<ModalProps & { guildId: string }>();
 
diff --git a/components/Me/AddFriend.vue b/components/Me/AddFriend.vue
index 6d2d888..49aa112 100644
--- a/components/Me/AddFriend.vue
+++ b/components/Me/AddFriend.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script lang="ts" setup>
-import Button from '~/components/UserInterface/Button.vue';
+import Button from '../UserInterface/Button.vue';
 
 const inputField = ref<HTMLInputElement>();
 const { addFriend } = useApi();
diff --git a/components/UserInterface/MessageReply.vue b/components/MessageReply.vue
similarity index 100%
rename from components/UserInterface/MessageReply.vue
rename to components/MessageReply.vue
diff --git a/components/Modals/Modal.vue b/components/Modal.vue
similarity index 96%
rename from components/Modals/Modal.vue
rename to components/Modal.vue
index 1f57901..041dd1a 100644
--- a/components/Modals/Modal.vue
+++ b/components/Modal.vue
@@ -12,7 +12,7 @@
 
 <script lang="ts" setup>
 import type { ModalProps } from '~/types/interfaces';
-import Button from '~/components/UserInterface/Button.vue';
+import Button from './UserInterface/Button.vue';
 
 const props = defineProps<ModalProps>();
 const dialog = ref<HTMLDialogElement>();
diff --git a/layouts/client.vue b/layouts/client.vue
index b609c2c..6b3bfa1 100644
--- a/layouts/client.vue
+++ b/layouts/client.vue
@@ -39,8 +39,8 @@
 
 <script lang="ts" setup>
 import { render } from 'vue';
-import GuildDropdown from '~/components/Guild/GuildDropdown.vue';
-import Modal from '~/components/Modals/Modal.vue';
+import Dropdown from '~/components/Dropdown.vue';
+import Modal from '~/components/Modal.vue';
 import Button from '~/components/UserInterface/Button.vue';
 import type { GuildResponse } from '~/types/interfaces';
 
@@ -180,7 +180,7 @@ const members = [
 ];
 
 function createDropdown() {
-	const dropdown = h(GuildDropdown, { options });
+	const dropdown = h(Dropdown, { options });
 	const div = document.createElement("div");
 	div.classList.add("dropdown", "destroy-on-click");
 	if (createButtonContainer.value) {
diff --git a/pages/servers/[serverId]/channels/[channelId].vue b/pages/servers/[serverId]/channels/[channelId].vue
index d9f6d97..4393a5d 100644
--- a/pages/servers/[serverId]/channels/[channelId].vue
+++ b/pages/servers/[serverId]/channels/[channelId].vue
@@ -25,9 +25,6 @@
 
 <script lang="ts" setup>
 import ChannelEntry from "~/components/Guild/ChannelEntry.vue";
-import GuildOptionsMenu from "~/components/Guild/GuildOptionsMenu.vue";
-import MemberEntry from "~/components/Member/MemberEntry.vue";
-import type { ChannelResponse, GuildMemberResponse, GuildResponse, MessageResponse } from "~/types/interfaces";
 
 const route = useRoute();
 
@@ -44,6 +41,8 @@ const members = ref<GuildMemberResponse[]>();
 const showInvitePopup = ref(false);
 const showGuildSettings = ref(false);
 
+import type { ChannelResponse, GuildMemberResponse, GuildResponse, MessageResponse } from "~/types/interfaces";
+
 //const servers = await fetchWithApi("/servers") as { uuid: string, name: string, description: string }[];
 //console.log("channelid: servers:", servers);
 
diff --git a/utils/createContextMenu.ts b/utils/createContextMenu.ts
index 88fe6fb..f3c4aab 100644
--- a/utils/createContextMenu.ts
+++ b/utils/createContextMenu.ts
@@ -1,5 +1,5 @@
 import { render } from "vue";
-import ContextMenu from "~/components/UserInterface/ContextMenu.vue";
+import ContextMenu from "~/components/ContextMenu.vue";
 import type { ContextMenuItem } from "~/types/interfaces";
 
 export default (e: MouseEvent, menuItems: ContextMenuItem[]) => {
diff --git a/utils/replyToMessage.ts b/utils/replyToMessage.ts
index cab6152..bbb453b 100644
--- a/utils/replyToMessage.ts
+++ b/utils/replyToMessage.ts
@@ -1,5 +1,5 @@
 import { render } from "vue";
-import MessageReply from "~/components/UserInterface/MessageReply.vue";
+import MessageReply from "~/components/MessageReply.vue";
 import type { MessageProps } from "~/types/props";
 
 export default (element: HTMLDivElement, props: MessageProps) => {