diff --git a/heat-stack/app/components/ui/CaseSummaryComponents/CurrentHeatingSystem.tsx b/heat-stack/app/components/ui/heat/CaseSummaryComponents/CurrentHeatingSystem.tsx
similarity index 100%
rename from heat-stack/app/components/ui/CaseSummaryComponents/CurrentHeatingSystem.tsx
rename to heat-stack/app/components/ui/heat/CaseSummaryComponents/CurrentHeatingSystem.tsx
diff --git a/heat-stack/app/components/ui/CaseSummaryComponents/EnergyUseHistory.tsx b/heat-stack/app/components/ui/heat/CaseSummaryComponents/EnergyUseHistory.tsx
similarity index 100%
rename from heat-stack/app/components/ui/CaseSummaryComponents/EnergyUseHistory.tsx
rename to heat-stack/app/components/ui/heat/CaseSummaryComponents/EnergyUseHistory.tsx
diff --git a/heat-stack/app/components/ui/CaseSummaryComponents/EnergyUseHistoryChart.tsx b/heat-stack/app/components/ui/heat/CaseSummaryComponents/EnergyUseHistoryChart.tsx
similarity index 92%
rename from heat-stack/app/components/ui/CaseSummaryComponents/EnergyUseHistoryChart.tsx
rename to heat-stack/app/components/ui/heat/CaseSummaryComponents/EnergyUseHistoryChart.tsx
index 595b0f5e..ab530869 100644
--- a/heat-stack/app/components/ui/CaseSummaryComponents/EnergyUseHistoryChart.tsx
+++ b/heat-stack/app/components/ui/heat/CaseSummaryComponents/EnergyUseHistoryChart.tsx
@@ -1,4 +1,4 @@
-import { Checkbox } from '../../../components/ui/checkbox.tsx'
+import { Checkbox } from '../../../../components/ui/checkbox.tsx'
 
 import {
 	Table,
@@ -7,7 +7,7 @@ import {
 	TableHead,
 	TableHeader,
 	TableRow,
-} from '../../../components/ui/table.tsx'
+} from '../../../../components/ui/table.tsx'
 
 const months = [
 	{
diff --git a/heat-stack/app/components/ui/CaseSummaryComponents/Graphs.tsx b/heat-stack/app/components/ui/heat/CaseSummaryComponents/Graphs.tsx
similarity index 100%
rename from heat-stack/app/components/ui/CaseSummaryComponents/Graphs.tsx
rename to heat-stack/app/components/ui/heat/CaseSummaryComponents/Graphs.tsx
diff --git a/heat-stack/app/components/ui/CaseSummaryComponents/Graphs/HeatLoad.tsx b/heat-stack/app/components/ui/heat/CaseSummaryComponents/Graphs/HeatLoad.tsx
similarity index 100%
rename from heat-stack/app/components/ui/CaseSummaryComponents/Graphs/HeatLoad.tsx
rename to heat-stack/app/components/ui/heat/CaseSummaryComponents/Graphs/HeatLoad.tsx
diff --git a/heat-stack/app/components/ui/CaseSummaryComponents/Graphs/StandardDeviationOfUA.tsx b/heat-stack/app/components/ui/heat/CaseSummaryComponents/Graphs/StandardDeviationOfUA.tsx
similarity index 100%
rename from heat-stack/app/components/ui/CaseSummaryComponents/Graphs/StandardDeviationOfUA.tsx
rename to heat-stack/app/components/ui/heat/CaseSummaryComponents/Graphs/StandardDeviationOfUA.tsx
diff --git a/heat-stack/app/components/ui/CaseSummaryComponents/Graphs/WholeHomeUAComparison.tsx b/heat-stack/app/components/ui/heat/CaseSummaryComponents/Graphs/WholeHomeUAComparison.tsx
similarity index 100%
rename from heat-stack/app/components/ui/CaseSummaryComponents/Graphs/WholeHomeUAComparison.tsx
rename to heat-stack/app/components/ui/heat/CaseSummaryComponents/Graphs/WholeHomeUAComparison.tsx
diff --git a/heat-stack/app/components/ui/CaseSummaryComponents/HomeInformation.tsx b/heat-stack/app/components/ui/heat/CaseSummaryComponents/HomeInformation.tsx
similarity index 95%
rename from heat-stack/app/components/ui/CaseSummaryComponents/HomeInformation.tsx
rename to heat-stack/app/components/ui/heat/CaseSummaryComponents/HomeInformation.tsx
index ad560b2e..4ec97b8f 100644
--- a/heat-stack/app/components/ui/CaseSummaryComponents/HomeInformation.tsx
+++ b/heat-stack/app/components/ui/heat/CaseSummaryComponents/HomeInformation.tsx
@@ -1,6 +1,6 @@
 import { Form } from '@remix-run/react'
-import { Input } from '../input.tsx'
-import { Label } from '../label.tsx'
+import { Input } from '../../input.tsx'
+import { Label } from '../../label.tsx'
 
 export function HomeInformation() {
 	const name = 'Pietro Schirano'
diff --git a/heat-stack/app/routes/_heat+/CaseSummary.tsx b/heat-stack/app/routes/_heat+/CaseSummary.tsx
index ea89d79b..196dedac 100644
--- a/heat-stack/app/routes/_heat+/CaseSummary.tsx
+++ b/heat-stack/app/routes/_heat+/CaseSummary.tsx
@@ -1,7 +1,7 @@
-import { CurrentHeatingSystem } from '../../components/ui/CaseSummaryComponents/CurrentHeatingSystem.tsx'
-import { EnergyUseHistory } from '../../components/ui/CaseSummaryComponents/EnergyUseHistory.tsx'
-import { Graphs } from '../../components/ui/CaseSummaryComponents/Graphs.tsx'
-import { HomeInformation } from '../../components/ui/CaseSummaryComponents/HomeInformation.tsx'
+import { CurrentHeatingSystem } from '../../components/ui/heat/CaseSummaryComponents/CurrentHeatingSystem.tsx'
+import { EnergyUseHistory } from '../../components/ui/heat/CaseSummaryComponents/EnergyUseHistory.tsx'
+import { Graphs } from '../../components/ui/heat/CaseSummaryComponents/Graphs.tsx'
+import { HomeInformation } from '../../components/ui/heat/CaseSummaryComponents/HomeInformation.tsx'
 
 export default function CaseSummary() {
 	return (