diff --git a/components/UserInterface/Button.vue b/components/Button.vue
similarity index 100%
rename from components/UserInterface/Button.vue
rename to components/Button.vue
diff --git a/components/Guild/Channel.vue b/components/Channel.vue
similarity index 100%
rename from components/Guild/Channel.vue
rename to components/Channel.vue
diff --git a/components/Popups/CropPopup.vue b/components/CropPopup.vue
similarity index 100%
rename from components/Popups/CropPopup.vue
rename to components/CropPopup.vue
diff --git a/components/DirectMessagesSidebar.vue b/components/DirectMessagesSidebar.vue
deleted file mode 100644
index d9f677d..0000000
--- a/components/DirectMessagesSidebar.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-	<div id="friend-sidebar">
-		<div id="server-title">
-			<h3>Direct Messages</h3>
-		</div>
-		<verticalSpacer />
-		<div id="direct-message-list">
-			<UserEntry v-for="user of friends" :user="user" :name="user.display_name || user.username"
-				:href="`/me/${user.uuid}`"/> 
-			<!-- <Channel v-for="channel of channels" :name="channel.name"
-				:uuid="channel.uuid" :current-uuid="(route.params.channelId as string)"
-				:href="`/servers/${route.params.serverId}/channels/${channel.uuid}`" /> -->
-		</div>
-	</div>
-</template>
-
-<script lang="ts" setup>
-const { fetchFriends } = useApi();
-
-const friends = await fetchFriends()
-
-console.log(friends)
-
-definePageMeta({
-	layout: "client"
-});
-
-</script>
-
-<style>
-#friend-sidebar {
-	padding-left: .5em;
-	padding-right: .5em;
-	border-right: 1px solid var(--padding-color);
-	background: var(--optional-channel-list-background);
-	background-color: var(--sidebar-background-color);
-}
-</style>
\ No newline at end of file
diff --git a/components/Popups/InvitePopup.vue b/components/InvitePopup.vue
similarity index 100%
rename from components/Popups/InvitePopup.vue
rename to components/InvitePopup.vue
diff --git a/components/Popups/Loading.vue b/components/Loading.vue
similarity index 100%
rename from components/Popups/Loading.vue
rename to components/Loading.vue
diff --git a/components/Member/MemberEntry.vue b/components/MemberEntry.vue
similarity index 100%
rename from components/Member/MemberEntry.vue
rename to components/MemberEntry.vue
diff --git a/components/User/UserEntry.vue b/components/User/UserEntry.vue
deleted file mode 100644
index dcea368..0000000
--- a/components/User/UserEntry.vue
+++ /dev/null
@@ -1,35 +0,0 @@
-<template>
-    <NuxtLink class="user-item" :href="`/me/${user.uuid}`" tabindex="0">
-        <img v-if="props.user.avatar" class="user-avatar" :src="props.user.avatar" :alt="props.user.display_name ?? props.user.username" />
-        <Icon v-else class="user-avatar" name="lucide:user" />
-        <span class="user-display-name">{{ props.user.display_name || props.user.username }}</span>
-	</NuxtLink>
-</template>
-
-<script lang="ts" setup>
-import type { UserResponse } from '~/types/interfaces';
-
-const props = defineProps<{
-    user: UserResponse
-}>();
-</script>
-
-<style>
-.user-item {
-    display: flex;
-	align-items: center;
-	text-align: left;
-
-	margin-top: .5em;
-	margin-bottom: .5em;
-	gap: .5em;
-    
-	cursor: pointer;
-}
-
-.user-avatar {
-    width: 2.3em;
-    height: 2.3em;
-    border-radius: 50%;
-}
-</style>
diff --git a/components/UserInterface/VerticalSpacer.vue b/components/UserArea.vue
similarity index 55%
rename from components/UserInterface/VerticalSpacer.vue
rename to components/UserArea.vue
index 293e9f0..d922c3f 100644
--- a/components/UserInterface/VerticalSpacer.vue
+++ b/components/UserArea.vue
@@ -1,5 +1,7 @@
 <template>
-  <span class="spacer"></span>
+	<div id="user-panel">
+		HELLO!!
+	</div>
 </template>
 
 <script lang="ts" setup>
@@ -12,10 +14,7 @@ const props = defineProps<{
 </script>
 
 <style scoped>
-.spacer {
-  height: 0.2dvh;
-  display: block;
-  margin: 0.8dvh 0.2dvw;
-  background-color: var(--padding-color);
+#user-panel {
+	width: 100%;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/components/User/UserPopup.vue b/components/UserPopup.vue
similarity index 100%
rename from components/User/UserPopup.vue
rename to components/UserPopup.vue
diff --git a/types/interfaces.ts b/types/interfaces.ts
index 7b9a97b..610d007 100644
--- a/types/interfaces.ts
+++ b/types/interfaces.ts
@@ -61,8 +61,7 @@ export interface UserResponse {
 	pronouns: string | null,
 	about: string | null,
 	email?: string,
-	email_verified?: boolean,
-	friends_since: string | null,
+	email_verified?: boolean
 }
 
 export interface StatsResponse {