diff --git a/client/src/components/Abbreviation.vue b/client/src/components/Common/Abbreviation.vue
similarity index 100%
rename from client/src/components/Abbreviation.vue
rename to client/src/components/Common/Abbreviation.vue
diff --git a/client/src/components/CarbonEmissions/BarChart.vue b/client/src/components/JobMetrics/CarbonEmissions/BarChart.vue
similarity index 100%
rename from client/src/components/CarbonEmissions/BarChart.vue
rename to client/src/components/JobMetrics/CarbonEmissions/BarChart.vue
diff --git a/client/src/components/CarbonEmissions/CarbonEmissionCard.vue b/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissionCard.vue
similarity index 100%
rename from client/src/components/CarbonEmissions/CarbonEmissionCard.vue
rename to client/src/components/JobMetrics/CarbonEmissions/CarbonEmissionCard.vue
diff --git a/client/src/components/CarbonEmissions/CarbonEmissions.test.js b/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissions.test.js
similarity index 100%
rename from client/src/components/CarbonEmissions/CarbonEmissions.test.js
rename to client/src/components/JobMetrics/CarbonEmissions/CarbonEmissions.test.js
diff --git a/client/src/components/CarbonEmissions/CarbonEmissions.vue b/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissions.vue
similarity index 100%
rename from client/src/components/CarbonEmissions/CarbonEmissions.vue
rename to client/src/components/JobMetrics/CarbonEmissions/CarbonEmissions.vue
diff --git a/client/src/components/CarbonEmissions/CarbonEmissionsCalculations.vue b/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissionsCalculations.vue
similarity index 100%
rename from client/src/components/CarbonEmissions/CarbonEmissionsCalculations.vue
rename to client/src/components/JobMetrics/CarbonEmissions/CarbonEmissionsCalculations.vue
diff --git a/client/src/components/CarbonEmissions/CarbonEmissionsIcon.vue b/client/src/components/JobMetrics/CarbonEmissions/CarbonEmissionsIcon.vue
similarity index 100%
rename from client/src/components/CarbonEmissions/CarbonEmissionsIcon.vue
rename to client/src/components/JobMetrics/CarbonEmissions/CarbonEmissionsIcon.vue
diff --git a/client/src/components/CarbonEmissions/carbonEmissionConstants.js b/client/src/components/JobMetrics/CarbonEmissions/carbonEmissionConstants.js
similarity index 100%
rename from client/src/components/CarbonEmissions/carbonEmissionConstants.js
rename to client/src/components/JobMetrics/CarbonEmissions/carbonEmissionConstants.js
diff --git a/client/src/components/CarbonEmissions/cpu_tdp.json b/client/src/components/JobMetrics/CarbonEmissions/cpu_tdp.json
similarity index 100%
rename from client/src/components/CarbonEmissions/cpu_tdp.json
rename to client/src/components/JobMetrics/CarbonEmissions/cpu_tdp.json
diff --git a/client/src/components/JobMetrics/JobMetrics.vue b/client/src/components/JobMetrics/JobMetrics.vue
index 6d5453baf92..faabecfb387 100644
--- a/client/src/components/JobMetrics/JobMetrics.vue
+++ b/client/src/components/JobMetrics/JobMetrics.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import AwsEstimate from "./AwsEstimate.vue";
-import CarbonEmissions from "@/components/CarbonEmissions/CarbonEmissions.vue";
-import cpuReferenceData from "@/components/CarbonEmissions/cpu_tdp.json";
+import CarbonEmissions from "./CarbonEmissions/CarbonEmissions.vue";
+import cpuReferenceData from "./CarbonEmissions/cpu_tdp.json";
 import ec2 from "./ec2.json";
 import { useJobMetricsStore } from "@/stores/jobMetricsStore";
 import { computed, unref } from "vue";