diff --git a/.eslint-baseline.json b/.eslint-baseline.json
index cf64d494e..215f27559 100644
--- a/.eslint-baseline.json
+++ b/.eslint-baseline.json
@@ -1,5 +1,5 @@
 {
-  "generatedAt": "2026-05-09T15:27:09.984Z",
+  "generatedAt": "2026-05-09T16:45:03.582Z",
   "totalErrors": 1547,
   "counts": {
     "src/components/admin/ImageUploadButton.tsx": {
@@ -1176,16 +1176,6 @@
     "src/components/products/zoomable-gallery/useGalleryZoom.ts": {
       "no-undef": 1
     },
-    "src/components/quote/MarginInsightBadge.tsx": {
-      "eqeqeq": 2
-    },
-    "src/components/quote/NegotiationMarkupCard.tsx": {
-      "eqeqeq": 3
-    },
-    "src/components/quote/QuickQuoteFAB.tsx": {
-      "@typescript-eslint/no-unused-vars": 2,
-      "no-duplicate-imports": 1
-    },
     "src/components/quotes/AdminTemplatesManager.tsx": {
       "@typescript-eslint/no-unused-vars": 1
     },
@@ -1197,10 +1187,20 @@
       "@typescript-eslint/no-unused-vars": 1,
       "no-undef": 4
     },
+    "src/components/quotes/MarginInsightBadge.tsx": {
+      "eqeqeq": 2
+    },
+    "src/components/quotes/NegotiationMarkupCard.tsx": {
+      "eqeqeq": 3
+    },
     "src/components/quotes/PdfGenerationDialog.tsx": {
       "@typescript-eslint/no-unused-vars": 11,
       "no-undef": 2
     },
+    "src/components/quotes/QuickQuoteFAB.tsx": {
+      "@typescript-eslint/no-unused-vars": 2,
+      "no-duplicate-imports": 1
+    },
     "src/components/quotes/QuoteAutoSave.tsx": {
       "@typescript-eslint/no-explicit-any": 4,
       "@typescript-eslint/no-unused-vars": 3,
diff --git a/src/components/layout/GlobalOverlay.tsx b/src/components/layout/GlobalOverlay.tsx
index 977286dd7..0fda77a54 100644
--- a/src/components/layout/GlobalOverlay.tsx
+++ b/src/components/layout/GlobalOverlay.tsx
@@ -8,7 +8,7 @@ const OnboardingTour = lazyWithRetry(() => import("@/components/onboarding/Onboa
 const ExpertChatButton = lazyWithRetry(() => import("@/components/expert/ExpertChatButton").then(m => ({ default: m.ExpertChatButton })));
 const EnhancedSpotlight = lazyWithRetry(() => import("@/components/common/EnhancedSpotlight").then(m => ({ default: m.EnhancedSpotlight })));
 const SmartMobileNav = lazyWithRetry(() => import("@/components/mobile/SmartMobileNav").then(m => ({ default: m.SmartMobileNav })));
-const QuickQuoteFAB = lazyWithRetry(() => import("@/components/quote/QuickQuoteFAB").then(m => ({ default: m.QuickQuoteFAB })));
+const QuickQuoteFAB = lazyWithRetry(() => import("@/components/quotes/QuickQuoteFAB").then(m => ({ default: m.QuickQuoteFAB })));
 const FloatingCompareBar = lazyWithRetry(() => import("@/components/compare/FloatingCompareBar").then(m => ({ default: m.FloatingCompareBar })));
 const ScrollToTopButton = lazyWithRetry(() => import("@/components/common/ScrollProgress").then(m => ({ default: m.ScrollToTopButton })));
 const ScrollProgressIndicator = lazyWithRetry(() => import("@/components/common/ScrollProgress").then(m => ({ default: m.ScrollProgressIndicator })));
diff --git a/src/components/quote/MarginInsightBadge.tsx b/src/components/quotes/MarginInsightBadge.tsx
similarity index 100%
rename from src/components/quote/MarginInsightBadge.tsx
rename to src/components/quotes/MarginInsightBadge.tsx
diff --git a/src/components/quote/NegotiationMarkupCard.tsx b/src/components/quotes/NegotiationMarkupCard.tsx
similarity index 100%
rename from src/components/quote/NegotiationMarkupCard.tsx
rename to src/components/quotes/NegotiationMarkupCard.tsx
diff --git a/src/components/quote/QuickQuoteFAB.tsx b/src/components/quotes/QuickQuoteFAB.tsx
similarity index 100%
rename from src/components/quote/QuickQuoteFAB.tsx
rename to src/components/quotes/QuickQuoteFAB.tsx
diff --git a/src/components/quotes/QuoteBuilderSummaryColumn.tsx b/src/components/quotes/QuoteBuilderSummaryColumn.tsx
index ceac14213..f44fb214d 100644
--- a/src/components/quotes/QuoteBuilderSummaryColumn.tsx
+++ b/src/components/quotes/QuoteBuilderSummaryColumn.tsx
@@ -16,7 +16,7 @@ import {
 import { AlertTriangle, Edit, Loader2, Package, Percent, Save, Send, Shield, ShoppingCart, Trash2, CheckCircle2, X } from "lucide-react";
 import { cn } from "@/lib/utils";
 import type { QuoteItem } from "@/hooks/useQuotes";
-import { NegotiationMarkupCard } from "@/components/quote/NegotiationMarkupCard";
+import { NegotiationMarkupCard } from "@/components/quotes/NegotiationMarkupCard";
 import { ConfirmDialog } from "@/components/common/ConfirmDialog";
 import { getPriceFreshness } from "@/utils/price-freshness";
 import { PriceFreshnessBadge } from "@/components/products/PriceFreshnessBadge";
diff --git a/src/components/simulation/SimulationPriceSourceBadge.tsx b/src/components/simulator/SimulationPriceSourceBadge.tsx
similarity index 100%
rename from src/components/simulation/SimulationPriceSourceBadge.tsx
rename to src/components/simulator/SimulationPriceSourceBadge.tsx