diff --git a/frontend/src/lib/components/project/card/card.svelte b/frontend/src/lib/components/card/Card.svelte
similarity index 97%
rename from frontend/src/lib/components/project/card/card.svelte
rename to frontend/src/lib/components/card/Card.svelte
index 7328249..e1fdc80 100644
--- a/frontend/src/lib/components/project/card/card.svelte
+++ b/frontend/src/lib/components/card/Card.svelte
@@ -3,7 +3,7 @@
 	import currentModalCard from '$lib/stores/currentModalCard';
 	import project_tags from '$lib/stores/projectTags';
 	import type Card from '$lib/types/Card';
-	import ModalCard from './modal_card.svelte';
+	import ModalCard from './ModalCard.svelte';
 
 	export let card: Card;
 </script>
diff --git a/frontend/src/lib/components/project/card/modal_card.svelte b/frontend/src/lib/components/card/ModalCard.svelte
similarity index 93%
rename from frontend/src/lib/components/project/card/modal_card.svelte
rename to frontend/src/lib/components/card/ModalCard.svelte
index a4ba76b..87acfb2 100644
--- a/frontend/src/lib/components/project/card/modal_card.svelte
+++ b/frontend/src/lib/components/card/ModalCard.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-	import CloseIcon from '$lib/components/icons/closeIcon.svelte';
+	import CloseIcon from '$lib/components/icons/CloseIcon.svelte';
+	import TrashIcon from '$lib/components/icons/TrashIcon.svelte';
+	import ModalTags from '$lib/components/tags/ModalTags.svelte';
 	import cards from '$lib/stores/cards';
 	import currentModalCard from '$lib/stores/currentModalCard';
 	import type Card from '$lib/types/Card';
-	import TrashIcon from '../../icons/trashIcon.svelte';
-	import ModalTags from './modal_tags.svelte';
 
 	export let card: Card;
 
diff --git a/frontend/src/lib/components/icons/addIcon.svelte b/frontend/src/lib/components/icons/AddIcon.svelte
similarity index 100%
rename from frontend/src/lib/components/icons/addIcon.svelte
rename to frontend/src/lib/components/icons/AddIcon.svelte
diff --git a/frontend/src/lib/components/icons/closeIcon.svelte b/frontend/src/lib/components/icons/CloseIcon.svelte
similarity index 100%
rename from frontend/src/lib/components/icons/closeIcon.svelte
rename to frontend/src/lib/components/icons/CloseIcon.svelte
diff --git a/frontend/src/lib/components/icons/editIcon.svelte b/frontend/src/lib/components/icons/EditIcon.svelte
similarity index 100%
rename from frontend/src/lib/components/icons/editIcon.svelte
rename to frontend/src/lib/components/icons/EditIcon.svelte
diff --git a/frontend/src/lib/components/icons/menu_opener.svelte b/frontend/src/lib/components/icons/MenuOpener.svelte
similarity index 100%
rename from frontend/src/lib/components/icons/menu_opener.svelte
rename to frontend/src/lib/components/icons/MenuOpener.svelte
diff --git a/frontend/src/lib/components/icons/trashIcon.svelte b/frontend/src/lib/components/icons/TrashIcon.svelte
similarity index 100%
rename from frontend/src/lib/components/icons/trashIcon.svelte
rename to frontend/src/lib/components/icons/TrashIcon.svelte
diff --git a/frontend/src/lib/components/icons/viewIcon.svelte b/frontend/src/lib/components/icons/ViewIcon.svelte
similarity index 100%
rename from frontend/src/lib/components/icons/viewIcon.svelte
rename to frontend/src/lib/components/icons/ViewIcon.svelte
diff --git a/frontend/src/lib/components/icons/chevron-right-svgrepo-com.svg b/frontend/src/lib/components/icons/chevron-right-svgrepo-com.svg
deleted file mode 100644
index 186dd4a..0000000
--- a/frontend/src/lib/components/icons/chevron-right-svgrepo-com.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9 6L15 12L9 18" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
\ No newline at end of file
diff --git a/frontend/src/lib/components/project/card/header/menus/group_menu.svelte b/frontend/src/lib/components/menu/GroupMenu.svelte
similarity index 93%
rename from frontend/src/lib/components/project/card/header/menus/group_menu.svelte
rename to frontend/src/lib/components/menu/GroupMenu.svelte
index 05b8b10..068ea40 100644
--- a/frontend/src/lib/components/project/card/header/menus/group_menu.svelte
+++ b/frontend/src/lib/components/menu/GroupMenu.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Menu from '$lib/components/utils/menu.svelte';
+	import Menu from '$lib/components/menu/Menu.svelte';
 
 	export let isOpen = false;
 	export let choices: { id: number; value: string }[] = [];
diff --git a/frontend/src/lib/components/utils/menu.svelte b/frontend/src/lib/components/menu/Menu.svelte
similarity index 100%
rename from frontend/src/lib/components/utils/menu.svelte
rename to frontend/src/lib/components/menu/Menu.svelte
diff --git a/frontend/src/lib/components/project/card/header/menus/sort_menu.svelte b/frontend/src/lib/components/menu/SortMenu.svelte
similarity index 94%
rename from frontend/src/lib/components/project/card/header/menus/sort_menu.svelte
rename to frontend/src/lib/components/menu/SortMenu.svelte
index cb266e9..cc05686 100644
--- a/frontend/src/lib/components/project/card/header/menus/sort_menu.svelte
+++ b/frontend/src/lib/components/menu/SortMenu.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Menu from '$lib/components/utils/menu.svelte';
+	import Menu from '$lib/components/menu/Menu.svelte';
 
 	export let isOpen = false;
 	export let choices: { id: number; value: string }[] = [];
diff --git a/frontend/src/lib/components/project/column.svelte b/frontend/src/lib/components/project/Column.svelte
similarity index 97%
rename from frontend/src/lib/components/project/column.svelte
rename to frontend/src/lib/components/project/Column.svelte
index c8919a7..654bf92 100644
--- a/frontend/src/lib/components/project/column.svelte
+++ b/frontend/src/lib/components/project/Column.svelte
@@ -7,8 +7,8 @@
 	import { createCardTagApi, deleteCardTagApi, updateCardTagApi } from '../../api/cards';
 	import { updateTagAPI as updateTagOptionAPI } from '../../api/tags';
 	import projectTags from '../../stores/projectTags';
-	import AddIcon from '../icons/addIcon.svelte';
-	import CardComponent from './card/card.svelte';
+	import CardComponent from '../card/Card.svelte';
+	import AddIcon from '../icons/AddIcon.svelte';
 
 	export let projectId: number;
 	export let optionId: number | null = null;
diff --git a/frontend/src/lib/components/project/header.svelte b/frontend/src/lib/components/project/Header.svelte
similarity index 94%
rename from frontend/src/lib/components/project/header.svelte
rename to frontend/src/lib/components/project/Header.svelte
index 1437593..95552cb 100644
--- a/frontend/src/lib/components/project/header.svelte
+++ b/frontend/src/lib/components/project/Header.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
+	import GroupMenu from '$lib/components/menu/GroupMenu.svelte';
+	import SortMenu from '$lib/components/menu/SortMenu.svelte';
 	import cards from '$lib/stores/cards';
 	import currentView from '$lib/stores/currentView';
+	import projectTags from '$lib/stores/projectTags';
 	import views from '$lib/stores/views';
 	import type Project from '$lib/types/Project';
 	import type View from '$lib/types/View';
-	import projectTags from '../../stores/projectTags';
-	import GroupMenu from './card/header/menus/group_menu.svelte';
-	import SortMenu from './card/header/menus/sort_menu.svelte';
 
 	export let project: Project;
 	export let view: View;
diff --git a/frontend/src/lib/components/project/project.svelte b/frontend/src/lib/components/project/Project.svelte
similarity index 96%
rename from frontend/src/lib/components/project/project.svelte
rename to frontend/src/lib/components/project/Project.svelte
index 5eab277..6bf11db 100644
--- a/frontend/src/lib/components/project/project.svelte
+++ b/frontend/src/lib/components/project/Project.svelte
@@ -5,8 +5,8 @@
 	import type Project from '$lib/types/Project';
 	import type View from '$lib/types/View';
 	import { onMount } from 'svelte';
-	import Column from './column.svelte';
-	import Header from './header.svelte';
+	import Column from './Column.svelte';
+	import Header from './Header.svelte';
 
 	export let project: Project;
 
diff --git a/frontend/src/lib/components/sidebar.svelte b/frontend/src/lib/components/project/Sidebar.svelte
similarity index 95%
rename from frontend/src/lib/components/sidebar.svelte
rename to frontend/src/lib/components/project/Sidebar.svelte
index 0815c51..68ab2c5 100644
--- a/frontend/src/lib/components/sidebar.svelte
+++ b/frontend/src/lib/components/project/Sidebar.svelte
@@ -5,10 +5,10 @@
 	import type View from '$lib/types/View';
 	import { onMount } from 'svelte';
 	import { get } from 'svelte/store';
-	import projectTags from '../stores/projectTags';
-	import EditIcon from './icons/editIcon.svelte';
-	import MenuOpener from './icons/menu_opener.svelte';
-	import ViewIcon from './icons/viewIcon.svelte';
+	import projectTags from '../../stores/projectTags';
+	import EditIcon from '../icons/EditIcon.svelte';
+	import MenuOpener from '../icons/MenuOpener.svelte';
+	import ViewIcon from '../icons/ViewIcon.svelte';
 
 	export let project: Project;
 
diff --git a/frontend/src/lib/components/projects/selectProject.svelte b/frontend/src/lib/components/projects/SelectProject.svelte
similarity index 100%
rename from frontend/src/lib/components/projects/selectProject.svelte
rename to frontend/src/lib/components/projects/SelectProject.svelte
diff --git a/frontend/src/lib/components/project/card/modal_tag/modal_new_tag.svelte b/frontend/src/lib/components/tags/ModalNewTag.svelte
similarity index 90%
rename from frontend/src/lib/components/project/card/modal_tag/modal_new_tag.svelte
rename to frontend/src/lib/components/tags/ModalNewTag.svelte
index b6b6c3d..500d74b 100644
--- a/frontend/src/lib/components/project/card/modal_tag/modal_new_tag.svelte
+++ b/frontend/src/lib/components/tags/ModalNewTag.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-	import AddIcon from '$lib/components/icons/addIcon.svelte';
-	import Menu from '$lib/components/utils/menu.svelte';
+	import AddIcon from '$lib/components/icons/AddIcon.svelte';
+	import Menu from '$lib/components/menu/Menu.svelte';
 	import project_tags from '$lib/stores/projectTags';
 	import { toastAlert } from '$lib/utils/toasts';
 	import { tick } from 'svelte';
-	import ModalTagTypes from './modal_tag_types.svelte';
+	import ModalTagTypes from './ModalTagTypes.svelte';
 
 	export let projectId: number;
 
diff --git a/frontend/src/lib/components/project/card/modal_tag.svelte b/frontend/src/lib/components/tags/ModalTag.svelte
similarity index 74%
rename from frontend/src/lib/components/project/card/modal_tag.svelte
rename to frontend/src/lib/components/tags/ModalTag.svelte
index 7109895..fb85e89 100644
--- a/frontend/src/lib/components/project/card/modal_tag.svelte
+++ b/frontend/src/lib/components/tags/ModalTag.svelte
@@ -2,8 +2,8 @@
 	import type Card from '$lib/types/Card';
 	import type MeTag from '$lib/types/MeTag';
 	import type TagValue from '$lib/types/TagValue';
-	import ModalTagTitle from './modal_tag/modal_tag_title.svelte';
-	import ModalTagValue from './modal_tag/modal_tag_value.svelte';
+	import ModalTagTitle from './ModalTagTitle.svelte';
+	import ModalTagValue from './ModalTagValue.svelte';
 
 	export let projectTag: MeTag;
 	export let tagValue: TagValue | undefined;
diff --git a/frontend/src/lib/components/project/card/modal_tag/modal_tag_title.svelte b/frontend/src/lib/components/tags/ModalTagTitle.svelte
similarity index 96%
rename from frontend/src/lib/components/project/card/modal_tag/modal_tag_title.svelte
rename to frontend/src/lib/components/tags/ModalTagTitle.svelte
index a1fa396..84e6cc6 100644
--- a/frontend/src/lib/components/project/card/modal_tag/modal_tag_title.svelte
+++ b/frontend/src/lib/components/tags/ModalTagTitle.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
-	import Menu from '$lib/components/utils/menu.svelte';
+	import Menu from '$lib/components/menu/Menu.svelte';
 	import project_tags from '$lib/stores/projectTags';
 	import type MeTag from '$lib/types/MeTag';
 	import { toastAlert } from '$lib/utils/toasts';
 	import { tick } from 'svelte';
-	import ModalTagTypes from './modal_tag_types.svelte';
+	import ModalTagTypes from './ModalTagTypes.svelte';
 
 	export let projectTag: MeTag;
 
diff --git a/frontend/src/lib/components/project/card/modal_tag/modal_tag_types.svelte b/frontend/src/lib/components/tags/ModalTagTypes.svelte
similarity index 96%
rename from frontend/src/lib/components/project/card/modal_tag/modal_tag_types.svelte
rename to frontend/src/lib/components/tags/ModalTagTypes.svelte
index 01c29d3..4f7003c 100644
--- a/frontend/src/lib/components/project/card/modal_tag/modal_tag_types.svelte
+++ b/frontend/src/lib/components/tags/ModalTagTypes.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Menu from '$lib/components/utils/menu.svelte';
+	import Menu from '$lib/components/menu/Menu.svelte';
 	import { getTagTypeFromId, tagTypes } from '$lib/utils/tagTypes';
 
 	export let type: number;
diff --git a/frontend/src/lib/components/project/card/modal_tag/modal_tag_value.svelte b/frontend/src/lib/components/tags/ModalTagValue.svelte
similarity index 92%
rename from frontend/src/lib/components/project/card/modal_tag/modal_tag_value.svelte
rename to frontend/src/lib/components/tags/ModalTagValue.svelte
index 04e6aa2..9da23d5 100644
--- a/frontend/src/lib/components/project/card/modal_tag/modal_tag_value.svelte
+++ b/frontend/src/lib/components/tags/ModalTagValue.svelte
@@ -3,7 +3,7 @@
 	import type MeTag from '$lib/types/MeTag';
 	import type TagValue from '$lib/types/TagValue';
 	import { getTagTypeFromId } from '$lib/utils/tagTypes';
-	import SelectTags from './select_tags.svelte';
+	import SelectTags from './SelectTags.svelte';
 
 	export let projectTag: MeTag;
 	export let tagValue: TagValue | undefined;
diff --git a/frontend/src/lib/components/project/card/modal_tags.svelte b/frontend/src/lib/components/tags/ModalTags.svelte
similarity index 78%
rename from frontend/src/lib/components/project/card/modal_tags.svelte
rename to frontend/src/lib/components/tags/ModalTags.svelte
index b7c5f78..17d3545 100644
--- a/frontend/src/lib/components/project/card/modal_tags.svelte
+++ b/frontend/src/lib/components/tags/ModalTags.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import ProjectTags from '$lib/stores/projectTags';
 	import type Card from '$lib/types/Card';
-	import ModalTag from './modal_tag.svelte';
-	import ModalNewTag from './modal_tag/modal_new_tag.svelte';
+	import ModalNewTag from './ModalNewTag.svelte';
+	import ModalTag from './ModalTag.svelte';
 
 	export let card: Card;
 </script>
diff --git a/frontend/src/lib/components/project/card/modal_tag/select_tags.svelte b/frontend/src/lib/components/tags/SelectTags.svelte
similarity index 97%
rename from frontend/src/lib/components/project/card/modal_tag/select_tags.svelte
rename to frontend/src/lib/components/tags/SelectTags.svelte
index 36c9f90..37cdbef 100644
--- a/frontend/src/lib/components/project/card/modal_tag/select_tags.svelte
+++ b/frontend/src/lib/components/tags/SelectTags.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { updateCardTagApi } from '$lib/api/cards';
-	import TrashIcon from '$lib/components/icons/trashIcon.svelte';
-	import Menu from '$lib/components/utils/menu.svelte';
+	import TrashIcon from '$lib/components/icons/TrashIcon.svelte';
+	import Menu from '$lib/components/menu/Menu.svelte';
 	import cards from '$lib/stores/cards';
 	import project_tags from '$lib/stores/projectTags';
 	import type Card from '$lib/types/Card';
diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte
index 9cd4499..9ae68e9 100644
--- a/frontend/src/routes/+page.svelte
+++ b/frontend/src/routes/+page.svelte
@@ -2,7 +2,7 @@
 	import type Project from '$lib/types/Project';
 	import { SvelteToast } from '@zerodevx/svelte-toast';
 	import { onMount } from 'svelte';
-	import SelectProject from '../lib/components/projects/selectProject.svelte';
+	import SelectProject from '../lib/components/projects/SelectProject.svelte';
 	import api, { processError } from '../lib/utils/api';
 	import { toastAlert } from '../lib/utils/toasts';
 
diff --git a/frontend/src/routes/[project]/+page.svelte b/frontend/src/routes/[project]/+page.svelte
index 3169f0b..176cc6a 100644
--- a/frontend/src/routes/[project]/+page.svelte
+++ b/frontend/src/routes/[project]/+page.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
 	import { page } from '$app/stores';
 	import { getProjectAPI } from '$lib/api/projects';
-	import ProjectComponent from '$lib/components/project/project.svelte';
-	import Sidebar from '$lib/components/sidebar.svelte';
+	import ProjectComponent from '$lib/components/project/Project.svelte';
+	import Sidebar from '$lib/components/project/Sidebar.svelte';
 	import type Project from '$lib/types/Project';
 	import { SvelteToast } from '@zerodevx/svelte-toast';
 	import { onMount } from 'svelte';