diff --git a/src/components/LeaderboardComponents/Leaderboard.vue b/src/components/Leaderboard/Leaderboard.vue
similarity index 100%
rename from src/components/LeaderboardComponents/Leaderboard.vue
rename to src/components/Leaderboard/Leaderboard.vue
diff --git a/src/components/LeaderboardComponents/__tests__/Leaderboard.spec.ts b/src/components/Leaderboard/__tests__/Leaderboard.spec.ts
similarity index 91%
rename from src/components/LeaderboardComponents/__tests__/Leaderboard.spec.ts
rename to src/components/Leaderboard/__tests__/Leaderboard.spec.ts
index cc604b72b7b39ea455c6c52e2711b88302d040b9..93b3f9d7cfa25fe2940d5e2a227b6fd809e49806 100644
--- a/src/components/LeaderboardComponents/__tests__/Leaderboard.spec.ts
+++ b/src/components/Leaderboard/__tests__/Leaderboard.spec.ts
@@ -2,9 +2,9 @@ import { describe, it, expect, beforeEach, vi } from 'vitest';
 import { mount } from '@vue/test-utils';
 import { createRouter, createMemoryHistory } from 'vue-router';
 import { createPinia, setActivePinia } from 'pinia';
-import Leaderboard from '@/components/LeaderboardComponents/Leaderboard.vue';
-import { useUserInfoStore } from '@/stores/UserStore';
-import router from '@/router/index';
+import Leaderboard from '../Leaderboard.vue';
+import { useUserInfoStore } from '../../../stores/UserStore';
+import router from '../../../router';
 
 describe('Leaderboard', () => {
 
diff --git a/src/components/NewsComponents/NewsComponent.vue b/src/components/News/NewsComponent.vue
similarity index 100%
rename from src/components/NewsComponents/NewsComponent.vue
rename to src/components/News/NewsComponent.vue
diff --git a/src/components/NewsComponents/__tests__/NewsComponent.spec.ts b/src/components/News/__tests__/NewsComponent.spec.ts
similarity index 89%
rename from src/components/NewsComponents/__tests__/NewsComponent.spec.ts
rename to src/components/News/__tests__/NewsComponent.spec.ts
index ac57f8a37cecb8f2983c52ae3e163520d6c33ae8..14c4a98dbd7e4ae8cc10d248488fc310263f0210 100644
--- a/src/components/NewsComponents/__tests__/NewsComponent.spec.ts
+++ b/src/components/News/__tests__/NewsComponent.spec.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { mount } from '@vue/test-utils';
-import MyComponent from '@/components/NewsComponents/NewsComponent.vue'; // Adjust the import path according to your setup
+import MyComponent from '../NewsComponent.vue'; // Adjust the import path according to your setup
 
 global.fetch = vi.fn(() =>
   Promise.resolve(
diff --git a/src/components/SavingGoalComponents/SavingGoal.vue b/src/components/SavingGoal/SavingGoal.vue
similarity index 90%
rename from src/components/SavingGoalComponents/SavingGoal.vue
rename to src/components/SavingGoal/SavingGoal.vue
index 40d65c8f1a21bf217e8d04792751f4458a07e52d..3644980546960ef148747fa116d97ccdade6a8a6 100644
--- a/src/components/SavingGoalComponents/SavingGoal.vue
+++ b/src/components/SavingGoal/SavingGoal.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
-import SavingGoalList from "@/components/SavingGoalComponents/SavingGoalList.vue";
-import SavingGoalRoadmap from "@/components/SavingGoalComponents/SavingGoalRoadmap.vue";
-import SavingGoalCreate from "@/components/SavingGoalComponents/SavingGoalCreate.vue";
+import SavingGoalList from "@/components/SavingGoal/SavingGoalList.vue";
+import SavingGoalRoadmap from "@/components/SavingGoal/SavingGoalRoadmap.vue";
+import SavingGoalCreate from "@/components/SavingGoal/SavingGoalCreate.vue";
 import type {GoalDTO} from "@/api";
 import {GoalService} from "@/api";
 
diff --git a/src/components/SavingGoalComponents/SavingGoalCreate.vue b/src/components/SavingGoal/SavingGoalCreate.vue
similarity index 100%
rename from src/components/SavingGoalComponents/SavingGoalCreate.vue
rename to src/components/SavingGoal/SavingGoalCreate.vue
diff --git a/src/components/SavingGoalComponents/SavingGoalList.vue b/src/components/SavingGoal/SavingGoalList.vue
similarity index 100%
rename from src/components/SavingGoalComponents/SavingGoalList.vue
rename to src/components/SavingGoal/SavingGoalList.vue
diff --git a/src/components/SavingGoalComponents/SavingGoalRoadmap.vue b/src/components/SavingGoal/SavingGoalRoadmap.vue
similarity index 100%
rename from src/components/SavingGoalComponents/SavingGoalRoadmap.vue
rename to src/components/SavingGoal/SavingGoalRoadmap.vue
diff --git a/src/views/Leaderboard/LeaderboardView.vue b/src/views/Leaderboard/LeaderboardView.vue
index d22af959eaf9ac3c422c4cd3993fcae41210f96a..241502e8230b5ffe639550422f6548a7f345f557 100644
--- a/src/views/Leaderboard/LeaderboardView.vue
+++ b/src/views/Leaderboard/LeaderboardView.vue
@@ -45,7 +45,7 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router';
-import Leaderboard from '@/components/LeaderboardComponents/Leaderboard.vue';
+import Leaderboard from '@/components/Leaderboard/Leaderboard.vue';
 import { LeaderboardService } from '@/api';
 
 let streakLeaderboardData = ref([] as  any);
diff --git a/src/views/News/NewsView.vue b/src/views/News/NewsView.vue
index bdfb7c611f43f0301e460f56b150a97213393a9d..1a3356021dd77f92e76df448bb50b3312b62e93e 100644
--- a/src/views/News/NewsView.vue
+++ b/src/views/News/NewsView.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import NewsComponent from "@/components/NewsComponents/NewsComponent.vue";
+import NewsComponent from "@/components/News/NewsComponent.vue";
 </script>
 
 
diff --git a/src/views/SavingGoal/RoadmapView.vue b/src/views/SavingGoal/RoadmapView.vue
index cdf655318efd24b40aab9b9e8fa1b82c3d30d3df..67921dc5416487704834d0f84c5cbe07cbf0eebd 100644
--- a/src/views/SavingGoal/RoadmapView.vue
+++ b/src/views/SavingGoal/RoadmapView.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import SavingGoal from "@/components/SavingGoalComponents/SavingGoal.vue";
+import SavingGoal from "@/components/SavingGoal/SavingGoal.vue";
 </script>
 
 <template>