diff --git a/components/Channel.vue b/components/Guild/Channel.vue
similarity index 100%
rename from components/Channel.vue
rename to components/Guild/Channel.vue
diff --git a/components/MemberEntry.vue b/components/Member/MemberEntry.vue
similarity index 100%
rename from components/MemberEntry.vue
rename to components/Member/MemberEntry.vue
diff --git a/components/CropPopup.vue b/components/Popups/CropPopup.vue
similarity index 100%
rename from components/CropPopup.vue
rename to components/Popups/CropPopup.vue
diff --git a/components/InvitePopup.vue b/components/Popups/InvitePopup.vue
similarity index 100%
rename from components/InvitePopup.vue
rename to components/Popups/InvitePopup.vue
diff --git a/components/Loading.vue b/components/Popups/Loading.vue
similarity index 100%
rename from components/Loading.vue
rename to components/Popups/Loading.vue
diff --git a/components/UserEntry.vue b/components/User/UserEntry.vue
similarity index 100%
rename from components/UserEntry.vue
rename to components/User/UserEntry.vue
diff --git a/components/UserPopup.vue b/components/User/UserPopup.vue
similarity index 100%
rename from components/UserPopup.vue
rename to components/User/UserPopup.vue
diff --git a/components/UserArea.vue b/components/UserArea.vue
deleted file mode 100644
index d922c3f..0000000
--- a/components/UserArea.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<template>
-	<div id="user-panel">
-		HELLO!!
-	</div>
-</template>
-
-<script lang="ts" setup>
-import type { UserResponse } from '~/types/interfaces';
-
-const props = defineProps<{
-	user: UserResponse,
-}>();
-
-</script>
-
-<style scoped>
-#user-panel {
-	width: 100%;
-}
-</style>
\ No newline at end of file
diff --git a/components/Button.vue b/components/UserInterface/Button.vue
similarity index 100%
rename from components/Button.vue
rename to components/UserInterface/Button.vue
diff --git a/components/VerticalSpacer.vue b/components/UserInterface/VerticalSpacer.vue
similarity index 100%
rename from components/VerticalSpacer.vue
rename to components/UserInterface/VerticalSpacer.vue