diff --git a/frontend/src/lib/components/Energy/AggregatedFood/AggregatedFoodComp.svelte b/frontend/src/lib/components/Energy/Aggregated/AggregatedFoodComp.svelte
similarity index 100%
rename from frontend/src/lib/components/Energy/AggregatedFood/AggregatedFoodComp.svelte
rename to frontend/src/lib/components/Energy/Aggregated/AggregatedFoodComp.svelte
diff --git a/frontend/src/lib/components/Energy/AggregatedFood/AggregatedFoodTable.svelte b/frontend/src/lib/components/Energy/Aggregated/AggregatedFoodTable.svelte
similarity index 96%
rename from frontend/src/lib/components/Energy/AggregatedFood/AggregatedFoodTable.svelte
rename to frontend/src/lib/components/Energy/Aggregated/AggregatedFoodTable.svelte
index 0329873..fca1f04 100644
--- a/frontend/src/lib/components/Energy/AggregatedFood/AggregatedFoodTable.svelte
+++ b/frontend/src/lib/components/Energy/Aggregated/AggregatedFoodTable.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Line } from "svelte-chartjs";
-	import AggregatedFoodComp from "$components/Energy/AggregatedFood/AggregatedFoodComp.svelte";
+	import AggregatedFoodComp from "$lib/components/Energy/Aggregated/AggregatedFoodComp.svelte";
 	import { main } from "$wails/models";
 	import type { ChartData, Point } from "chart.js";
 	import {
diff --git a/frontend/src/lib/components/Energy/Food/EmptyFoodComp.svelte b/frontend/src/lib/components/Energy/EmptyFoodComp.svelte
similarity index 100%
rename from frontend/src/lib/components/Energy/Food/EmptyFoodComp.svelte
rename to frontend/src/lib/components/Energy/EmptyFoodComp.svelte
diff --git a/frontend/src/lib/components/Energy/Food/FoodComp.svelte b/frontend/src/lib/components/Energy/FoodComp.svelte
similarity index 100%
rename from frontend/src/lib/components/Energy/Food/FoodComp.svelte
rename to frontend/src/lib/components/Energy/FoodComp.svelte
diff --git a/frontend/src/lib/components/Energy/Food/FoodTable.svelte b/frontend/src/lib/components/Energy/FoodTable.svelte
similarity index 95%
rename from frontend/src/lib/components/Energy/Food/FoodTable.svelte
rename to frontend/src/lib/components/Energy/FoodTable.svelte
index 34f5d95..b8cd4b6 100644
--- a/frontend/src/lib/components/Energy/Food/FoodTable.svelte
+++ b/frontend/src/lib/components/Energy/FoodTable.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-	import EmptyFoodComp from "$components/Energy/Food/EmptyFoodComp.svelte";
-	import FoodComp from "$components/Energy/Food/FoodComp.svelte";
 	import { GenerateColor } from "$lib/utils";
 	import { main } from "$wails/models";
+	import EmptyFoodComp from "./EmptyFoodComp.svelte";
+	import FoodComp from "./FoodComp.svelte";
 
 	export let items: main.Food[] = [];
 
diff --git a/frontend/src/lib/router/Router.svelte b/frontend/src/lib/router/Router.svelte
index 7aa8372..38c34e3 100644
--- a/frontend/src/lib/router/Router.svelte
+++ b/frontend/src/lib/router/Router.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
 	import Router from 'svelte-spa-router'
-	import Energy from './routes/Energy.svelte'
-	import Daily from './routes/Daily.svelte'
-	import Weekly from './routes/Weekly.svelte'
-	import Monthly from './routes/Monthly.svelte'
-	import Yearly from './routes/Yearly.svelte'
+	import Energy from './routes/Energy/Energy.svelte'
+	import Daily from './routes/Energy/Daily.svelte'
+	import Weekly from './routes/Energy/Weekly.svelte'
+	import Monthly from './routes/Energy/Monthly.svelte'
+	import Yearly from './routes/Energy/Yearly.svelte'
 
 	const routes = {
 		'/': Energy,
diff --git a/frontend/src/lib/router/routes/Daily.svelte b/frontend/src/lib/router/routes/Energy/Daily.svelte
similarity index 76%
rename from frontend/src/lib/router/routes/Daily.svelte
rename to frontend/src/lib/router/routes/Energy/Daily.svelte
index b30f4e3..633578d 100644
--- a/frontend/src/lib/router/routes/Daily.svelte
+++ b/frontend/src/lib/router/routes/Energy/Daily.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import AggregatedFoodTable from "$components/Energy/AggregatedFood/AggregatedFoodTable.svelte";
+	import AggregatedFoodTable from "$lib/components/Energy/Aggregated/AggregatedFoodTable.svelte";
 	import { dailyFoodStore } from "$lib/store/Energy/dailyFoodStore";
 	import { settingsStore } from "$lib/store/settingsStore";
 </script>
diff --git a/frontend/src/lib/router/routes/Energy.svelte b/frontend/src/lib/router/routes/Energy/Energy.svelte
similarity index 90%
rename from frontend/src/lib/router/routes/Energy.svelte
rename to frontend/src/lib/router/routes/Energy/Energy.svelte
index ea15748..5307d3a 100644
--- a/frontend/src/lib/router/routes/Energy.svelte
+++ b/frontend/src/lib/router/routes/Energy/Energy.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
+	import FoodTable from "$lib/components/Energy/FoodTable.svelte";
 	import { foodStore } from "$lib/store/Energy/foodStore";
-	import FoodTable from "$lib/components/Energy/Food/FoodTable.svelte";
 
 	// Fuck this hacky shit
 	// Svelte won't re-render FoodTable when using the store directly
diff --git a/frontend/src/lib/router/routes/Monthly.svelte b/frontend/src/lib/router/routes/Energy/Monthly.svelte
similarity index 76%
rename from frontend/src/lib/router/routes/Monthly.svelte
rename to frontend/src/lib/router/routes/Energy/Monthly.svelte
index 9eec13e..ce761f7 100644
--- a/frontend/src/lib/router/routes/Monthly.svelte
+++ b/frontend/src/lib/router/routes/Energy/Monthly.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import AggregatedFoodTable from "$components/Energy/AggregatedFood/AggregatedFoodTable.svelte";
+	import AggregatedFoodTable from "$lib/components/Energy/Aggregated/AggregatedFoodTable.svelte";
 	import { monthlyFoodStore } from "$lib/store/Energy/monthlyFoodStore";
 	import { settingsStore } from "$lib/store/settingsStore";
 </script>
diff --git a/frontend/src/lib/router/routes/Weekly.svelte b/frontend/src/lib/router/routes/Energy/Weekly.svelte
similarity index 76%
rename from frontend/src/lib/router/routes/Weekly.svelte
rename to frontend/src/lib/router/routes/Energy/Weekly.svelte
index 837c06f..9067557 100644
--- a/frontend/src/lib/router/routes/Weekly.svelte
+++ b/frontend/src/lib/router/routes/Energy/Weekly.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import AggregatedFoodTable from "$components/Energy/AggregatedFood/AggregatedFoodTable.svelte";
+	import AggregatedFoodTable from "$lib/components/Energy/Aggregated/AggregatedFoodTable.svelte";
 	import { weeklyFoodStore } from "$lib/store/Energy/weeklyFoodStore";
 	import { settingsStore } from "$lib/store/settingsStore";
 </script>
diff --git a/frontend/src/lib/router/routes/Yearly.svelte b/frontend/src/lib/router/routes/Energy/Yearly.svelte
similarity index 76%
rename from frontend/src/lib/router/routes/Yearly.svelte
rename to frontend/src/lib/router/routes/Energy/Yearly.svelte
index e4ec2b1..63a8617 100644
--- a/frontend/src/lib/router/routes/Yearly.svelte
+++ b/frontend/src/lib/router/routes/Energy/Yearly.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import AggregatedFoodTable from "$components/Energy/AggregatedFood/AggregatedFoodTable.svelte";
+	import AggregatedFoodTable from "$lib/components/Energy/Aggregated/AggregatedFoodTable.svelte";
 	import { yearlyFoodStore } from "$lib/store/Energy/yearlyFoodStore";
 	import { settingsStore } from "$lib/store/settingsStore";
 </script>