diff --git a/inventory-server/scripts/calculate-metrics.js b/inventory-server/scripts/calculate-metrics.js
index 67d0f1e..22ab9bc 100644
--- a/inventory-server/scripts/calculate-metrics.js
+++ b/inventory-server/scripts/calculate-metrics.js
@@ -35,13 +35,13 @@ global.getProgress = progress.getProgress;
 global.logError = progress.logError;
 
 const { getConnection, closePool } = require('./metrics/utils/db');
-const calculateProductMetrics = require('./metrics/core/product-metrics');
-const calculateTimeAggregates = require('./metrics/utils/time-aggregates');
-const calculateFinancialMetrics = require('./metrics/financial/financial-metrics');
-const calculateVendorMetrics = require('./metrics/vendor/vendor-metrics');
-const calculateCategoryMetrics = require('./metrics/category/category-metrics');
-const calculateBrandMetrics = require('./metrics/brand/brand-metrics');
-const calculateSalesForecasts = require('./metrics/forecasting/sales-forecasts');
+const calculateProductMetrics = require('./metrics/product-metrics');
+const calculateTimeAggregates = require('./metrics/time-aggregates');
+const calculateFinancialMetrics = require('./metrics/financial-metrics');
+const calculateVendorMetrics = require('./metrics/vendor-metrics');
+const calculateCategoryMetrics = require('./metrics/category-metrics');
+const calculateBrandMetrics = require('./metrics/brand-metrics');
+const calculateSalesForecasts = require('./metrics/sales-forecasts');
 
 // Set to 1 to skip product metrics and only calculate the remaining metrics
 const SKIP_PRODUCT_METRICS = 1;
diff --git a/inventory-server/scripts/metrics/brand/brand-metrics.js b/inventory-server/scripts/metrics/brand-metrics.js
similarity index 100%
rename from inventory-server/scripts/metrics/brand/brand-metrics.js
rename to inventory-server/scripts/metrics/brand-metrics.js
diff --git a/inventory-server/scripts/metrics/category/category-metrics.js b/inventory-server/scripts/metrics/category-metrics.js
similarity index 100%
rename from inventory-server/scripts/metrics/category/category-metrics.js
rename to inventory-server/scripts/metrics/category-metrics.js
diff --git a/inventory-server/scripts/metrics/financial/financial-metrics.js b/inventory-server/scripts/metrics/financial-metrics.js
similarity index 100%
rename from inventory-server/scripts/metrics/financial/financial-metrics.js
rename to inventory-server/scripts/metrics/financial-metrics.js
diff --git a/inventory-server/scripts/metrics/core/product-metrics.js b/inventory-server/scripts/metrics/product-metrics.js
similarity index 100%
rename from inventory-server/scripts/metrics/core/product-metrics.js
rename to inventory-server/scripts/metrics/product-metrics.js
diff --git a/inventory-server/scripts/metrics/forecasting/sales-forecasts.js b/inventory-server/scripts/metrics/sales-forecasts.js
similarity index 100%
rename from inventory-server/scripts/metrics/forecasting/sales-forecasts.js
rename to inventory-server/scripts/metrics/sales-forecasts.js
diff --git a/inventory-server/scripts/metrics/utils/time-aggregates.js b/inventory-server/scripts/metrics/time-aggregates.js
similarity index 100%
rename from inventory-server/scripts/metrics/utils/time-aggregates.js
rename to inventory-server/scripts/metrics/time-aggregates.js
diff --git a/inventory-server/scripts/metrics/vendor/vendor-metrics.js b/inventory-server/scripts/metrics/vendor-metrics.js
similarity index 100%
rename from inventory-server/scripts/metrics/vendor/vendor-metrics.js
rename to inventory-server/scripts/metrics/vendor-metrics.js