6 files changed, 15 insertions, 15 deletions
diff --git a/modern/src/map/PositionsMap.js b/modern/src/map/PositionsMap.js
index 103c1051..74b58beb 100644
--- a/modern/src/map/PositionsMap.js
+++ b/modern/src/map/PositionsMap.js
@@ -2,9 +2,9 @@ import { useCallback, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 
 import { map } from './core/Map';
-import { getStatusColor } from '../common/formatter';
+import { getStatusColor } from '../common/util/formatter';
 import { devicesActions } from '../store';
-import usePersistedState from '../common/usePersistedState';
+import usePersistedState from '../common/util/usePersistedState';
 
 const PositionsMap = ({ positions }) => {
   const id = 'positions';
diff --git a/modern/src/map/core/Map.js b/modern/src/map/core/Map.js
index b763dca2..e1254af6 100644
--- a/modern/src/map/core/Map.js
+++ b/modern/src/map/core/Map.js
@@ -5,15 +5,15 @@ import React, {
   useRef, useLayoutEffect, useEffect, useState,
 } from 'react';
 import { SwitcherControl } from '../switcher/switcher';
-import deviceCategories from '../../common/deviceCategories';
+import deviceCategories from '../../common/util/deviceCategories';
 import { prepareIcon, loadImage } from './mapUtil';
 import {
   styleCarto, styleLocationIq, styleMapbox, styleMapTiler, styleOsm,
 } from './mapStyles';
-import { useAttributePreference } from '../../common/preferences';
-import palette from '../../theme/palette';
+import { useAttributePreference } from '../../common/util/preferences';
+import palette from '../../common/theme/palette';
 import { useTranslation } from '../../LocalizationProvider';
-import usePersistedState, { savePersistedState } from '../../common/usePersistedState';
+import usePersistedState, { savePersistedState } from '../../common/util/usePersistedState';
 
 const element = document.createElement('div');
 element.style.width = '100%';
diff --git a/modern/src/map/main/DefaultCameraMap.js b/modern/src/map/main/DefaultCameraMap.js
index e8baadc4..256fbd04 100644
--- a/modern/src/map/main/DefaultCameraMap.js
+++ b/modern/src/map/main/DefaultCameraMap.js
@@ -1,7 +1,7 @@
 import maplibregl from 'maplibre-gl';
 import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
-import { usePreference } from '../../common/preferences';
+import { usePreference } from '../../common/util/preferences';
 import { map } from '../core/Map';
 
 const DefaultCameraMap = () => {
diff --git a/modern/src/map/main/PoiMap.js b/modern/src/map/main/PoiMap.js
index 4635148a..5874f356 100644
--- a/modern/src/map/main/PoiMap.js
+++ b/modern/src/map/main/PoiMap.js
@@ -3,7 +3,7 @@ import { kml } from '@tmcw/togeojson';
 
 import { map } from '../core/Map';
 import { useEffectAsync } from '../../reactHelper';
-import { usePreference } from '../../common/preferences';
+import { usePreference } from '../../common/util/preferences';
 
 const PoiMap = () => {
   const id = 'poi';
diff --git a/modern/src/map/main/SelectedDeviceMap.js b/modern/src/map/main/SelectedDeviceMap.js
index b5392b70..250be372 100644
--- a/modern/src/map/main/SelectedDeviceMap.js
+++ b/modern/src/map/main/SelectedDeviceMap.js
@@ -1,10 +1,10 @@
 import { useEffect } from 'react';
 
 import { useSelector } from 'react-redux';
-import dimensions from '../../theme/dimensions';
+import dimensions from '../../common/theme/dimensions';
 import { map } from '../core/Map';
 import { usePrevious } from '../../reactHelper';
-import usePersistedState from '../../common/usePersistedState';
+import usePersistedState from '../../common/util/usePersistedState';
 
 const SelectedDeviceMap = () => {
   const selectedDeviceId = useSelector((state) => state.devices.selectedId);
diff --git a/modern/src/map/main/StatusCard.js b/modern/src/map/main/StatusCard.js
index d431e647..33f924b3 100644
--- a/modern/src/map/main/StatusCard.js
+++ b/modern/src/map/main/StatusCard.js
@@ -11,11 +11,11 @@ import EditIcon from '@material-ui/icons/Edit';
 import DeleteIcon from '@material-ui/icons/Delete';
 
 import { useTranslation } from '../../LocalizationProvider';
-import { formatStatus } from '../../common/formatter';
-import RemoveDialog from '../../RemoveDialog';
-import PositionValue from '../../components/PositionValue';
-import dimensions from '../../theme/dimensions';
-import { useDeviceReadonly, useReadonly } from '../../common/permissions';
+import { formatStatus } from '../../common/util/formatter';
+import RemoveDialog from '../../common/components/RemoveDialog';
+import PositionValue from '../../common/components/PositionValue';
+import dimensions from '../../common/theme/dimensions';
+import { useDeviceReadonly, useReadonly } from '../../common/util/permissions';
 
 const useStyles = makeStyles((theme) => ({
   card: {