diff --git a/components/Message.vue b/components/Message.vue
index e766ed9..7bff711 100644
--- a/components/Message.vue
+++ b/components/Message.vue
@@ -71,6 +71,7 @@
 import DOMPurify from 'dompurify';
 import { parse } from 'marked';
 import type { MessageProps } from '~/types/props';
+import MessageReply from './UserInterface/MessageReply.vue';
 
 const props = defineProps<MessageProps>();
 
diff --git a/components/Modals/Modal.vue b/components/Modal/Base.vue
similarity index 100%
rename from components/Modals/Modal.vue
rename to components/Modal/Base.vue
diff --git a/components/Modals/InviteModal.vue b/components/Modal/Invite.vue
similarity index 95%
rename from components/Modals/InviteModal.vue
rename to components/Modal/Invite.vue
index 9c26bc2..232114c 100644
--- a/components/Modals/InviteModal.vue
+++ b/components/Modal/Invite.vue
@@ -1,5 +1,5 @@
 <template>
-	<Modal v-bind="props" :title="props.title || 'Create an invite'">
+	<ModalBase v-bind="props" :title="props.title || 'Create an invite'">
 		<div v-if="invite" id="invite-body">
 			<div id="invite-label">{{ invite }}</div>
 			<div id="invite-buttons">
@@ -10,7 +10,7 @@
 		<div v-else>
 			<Button text="Generate Invite" variant="normal" :callback="generateInvite">Generate Invite</Button>
 		</div>
-	</Modal>
+	</ModalBase>
 </template>
 
 <script lang="ts" setup>
diff --git a/layouts/client.vue b/layouts/client.vue
index 3781fe9..8aeaf9c 100644
--- a/layouts/client.vue
+++ b/layouts/client.vue
@@ -38,9 +38,9 @@
 </template>
 
 <script lang="ts" setup>
+import { ModalBase } from '#components';
 import { render } from 'vue';
 import GuildDropdown from '~/components/Guild/GuildDropdown.vue';
-import Modal from '~/components/Modals/Modal.vue';
 import Button from '~/components/UserInterface/Button.vue';
 import type { GuildResponse } from '~/types/interfaces';
 
@@ -54,7 +54,7 @@ const options = [
 	{ name: "Join", value: "join", callback: async () => {
 			console.log("join guild!");
 			const div = document.createElement("div");
-			const guildJoinModal = h(Modal, {
+			const guildJoinModal = h(ModalBase, {
 				title: "Join Guild",
 				id: "guild-join-modal",
 				onClose: () => {
@@ -97,7 +97,7 @@ const options = [
 			console.log("create guild");
 			const user = await useAuth().getUser();
 			const div = document.createElement("div");
-			const guildCreateModal = h(Modal, {
+			const guildCreateModal = h(ModalBase, {
 				title: "Create a Guild",
 				id: "guild-join-modal",
 				onClose: () => {