diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 8bd7b99..6147eee 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -10,7 +10,7 @@ import DataSources from './components/data-sources/DataSources';
 import DataSourcesPage from './components/data-sources/DataSourcesPage';
 import FAQPage from './components/faq/FAQPage';
 import HomePage from './components/home/HomePage';
-import Header, { type Page } from './components/shared/Header';
+import Header, { type Page } from './components/ui/Header';
 import { TabButton } from './components/ui/TabButton';
 import type {
   FeatureMeta,
diff --git a/frontend/src/components/map/AreaPane.tsx b/frontend/src/components/map/AreaPane.tsx
index b68c573..2080053 100644
--- a/frontend/src/components/map/AreaPane.tsx
+++ b/frontend/src/components/map/AreaPane.tsx
@@ -11,7 +11,7 @@ import PriceHistoryChart from './PriceHistoryChart';
 import ExternalSearchLinks from './ExternalSearchLinks';
 import { InfoIcon, CloseIcon } from '../ui/icons';
 import { IconButton } from '../ui/IconButton';
-import { FeatureInfoPopup } from '../shared/FeatureInfoPopup';
+import { FeatureInfoPopup } from '../ui/FeatureInfoPopup';
 import { EmptyState } from '../ui/EmptyState';
 import { FeatureLabel } from '../ui/FeatureLabel';
 
diff --git a/frontend/src/components/map/Filters.tsx b/frontend/src/components/map/Filters.tsx
index 01a74c0..ed35658 100644
--- a/frontend/src/components/map/Filters.tsx
+++ b/frontend/src/components/map/Filters.tsx
@@ -7,9 +7,9 @@ import { EmptyState } from '../ui/EmptyState';
 import type { FeatureMeta, FeatureFilters } from '../../types';
 import { formatFilterValue } from '../../lib/format';
 import { groupFeaturesByCategory } from '../../lib/features';
-import InfoPopup from '../shared/InfoPopup';
-import { FeatureInfoPopup } from '../shared/FeatureInfoPopup';
-import { FeatureActions } from '../shared/FeatureIcons';
+import InfoPopup from '../ui/InfoPopup';
+import { FeatureInfoPopup } from '../ui/FeatureInfoPopup';
+import { FeatureActions } from '../ui/FeatureIcons';
 import { FeatureLabel } from '../ui/FeatureLabel';
 
 interface FiltersProps {
diff --git a/frontend/src/components/map/POIPane.tsx b/frontend/src/components/map/POIPane.tsx
index 7655f98..4a8453b 100644
--- a/frontend/src/components/map/POIPane.tsx
+++ b/frontend/src/components/map/POIPane.tsx
@@ -1,7 +1,7 @@
 import { useState, useRef, useCallback } from 'react';
 import type { POICategoryGroup } from '../../types';
 import { useClickOutside } from '../../hooks/useClickOutside';
-import InfoPopup from '../shared/InfoPopup';
+import InfoPopup from '../ui/InfoPopup';
 import { SearchInput } from '../ui/SearchInput';
 import { InfoIcon, ChevronIcon } from '../ui/icons';
 import { IconButton } from '../ui/IconButton';
diff --git a/frontend/src/components/map/PropertiesPane.tsx b/frontend/src/components/map/PropertiesPane.tsx
index 6873476..483da91 100644
--- a/frontend/src/components/map/PropertiesPane.tsx
+++ b/frontend/src/components/map/PropertiesPane.tsx
@@ -2,7 +2,7 @@ import React, { useMemo, useState } from 'react';
 import { Property } from '../../types';
 import { formatDuration, formatAge, formatNumber } from '../../lib/format';
 import { getNum } from '../../lib/property-fields';
-import InfoPopup from '../shared/InfoPopup';
+import InfoPopup from '../ui/InfoPopup';
 import { SearchInput } from '../ui/SearchInput';
 import { EmptyState } from '../ui/EmptyState';
 import { InfoIcon } from '../ui/icons';
diff --git a/frontend/src/components/shared/FeatureIcons.tsx b/frontend/src/components/ui/FeatureIcons.tsx
similarity index 91%
rename from frontend/src/components/shared/FeatureIcons.tsx
rename to frontend/src/components/ui/FeatureIcons.tsx
index 2335859..51f992c 100644
--- a/frontend/src/components/shared/FeatureIcons.tsx
+++ b/frontend/src/components/ui/FeatureIcons.tsx
@@ -1,6 +1,6 @@
 import type { FeatureMeta } from '../../types';
-import { EyeIcon, InfoIcon, PlusIcon, CloseIcon } from '../ui/icons';
-import { IconButton } from '../ui/IconButton';
+import { EyeIcon, InfoIcon, PlusIcon, CloseIcon } from './icons';
+import { IconButton } from './IconButton';
 
 interface FeatureActionsProps {
   feature: FeatureMeta;
diff --git a/frontend/src/components/shared/FeatureInfoPopup.tsx b/frontend/src/components/ui/FeatureInfoPopup.tsx
similarity index 100%
rename from frontend/src/components/shared/FeatureInfoPopup.tsx
rename to frontend/src/components/ui/FeatureInfoPopup.tsx
diff --git a/frontend/src/components/shared/Header.tsx b/frontend/src/components/ui/Header.tsx
similarity index 100%
rename from frontend/src/components/shared/Header.tsx
rename to frontend/src/components/ui/Header.tsx
diff --git a/frontend/src/components/shared/InfoPopup.tsx b/frontend/src/components/ui/InfoPopup.tsx
similarity index 94%
rename from frontend/src/components/shared/InfoPopup.tsx
rename to frontend/src/components/ui/InfoPopup.tsx
index adbad08..64fac99 100644
--- a/frontend/src/components/shared/InfoPopup.tsx
+++ b/frontend/src/components/ui/InfoPopup.tsx
@@ -1,7 +1,7 @@
 import { useRef, useCallback, type ReactNode } from 'react';
 import { useClickOutside } from '../../hooks/useClickOutside';
-import { CloseIcon } from '../ui/icons';
-import { IconButton } from '../ui/IconButton';
+import { CloseIcon } from './icons';
+import { IconButton } from './IconButton';
 
 interface InfoPopupProps {
   title: string;