9 files changed, 16 insertions, 16 deletions
diff --git a/modern/src/settings/BaseCommandView.js b/modern/src/settings/BaseCommandView.js
index 51151588..03605d0f 100644
--- a/modern/src/settings/BaseCommandView.js
+++ b/modern/src/settings/BaseCommandView.js
@@ -4,7 +4,7 @@ import {
 } from '@material-ui/core';
 import { useTranslation } from '../LocalizationProvider';
 import SelectField from '../form/SelectField';
-import { prefixString } from '../common/stringUtils';
+import { prefixString } from '../common/util/stringUtils';
 import useCommandAttributes from '../attributes/useCommandAttributes';
 
 const BaseCommandView = ({ item, setItem }) => {
diff --git a/modern/src/settings/CommandsPage.js b/modern/src/settings/CommandsPage.js
index bf6b10aa..c9240f11 100644
--- a/modern/src/settings/CommandsPage.js
+++ b/modern/src/settings/CommandsPage.js
@@ -7,8 +7,8 @@ import { useEffectAsync } from '../reactHelper';
 import EditCollectionView from '../EditCollectionView';
 import OptionsLayout from './OptionsLayout';
 import { useTranslation } from '../LocalizationProvider';
-import { formatBoolean } from '../common/formatter';
-import { prefixString } from '../common/stringUtils';
+import { formatBoolean } from '../common/util/formatter';
+import { prefixString } from '../common/util/stringUtils';
 
 const useStyles = makeStyles((theme) => ({
   columnAction: {
diff --git a/modern/src/settings/ComputedAttributesPage.js b/modern/src/settings/ComputedAttributesPage.js
index 27be681e..40c7e339 100644
--- a/modern/src/settings/ComputedAttributesPage.js
+++ b/modern/src/settings/ComputedAttributesPage.js
@@ -7,7 +7,7 @@ import { useEffectAsync } from '../reactHelper';
 import EditCollectionView from '../EditCollectionView';
 import OptionsLayout from './OptionsLayout';
 import { useTranslation } from '../LocalizationProvider';
-import { useAdministrator } from '../common/permissions';
+import { useAdministrator } from '../common/util/permissions';
 
 const useStyles = makeStyles((theme) => ({
   columnAction: {
diff --git a/modern/src/settings/MaintenancePage.js b/modern/src/settings/MaintenancePage.js
index a612abb7..7f539ddf 100644
--- a/modern/src/settings/MaintenancePage.js
+++ b/modern/src/settings/MaintenancePage.js
@@ -4,13 +4,13 @@ import {
 } from '@material-ui/core';
 import InputAdornment from '@material-ui/core/InputAdornment';
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
-import { prefixString } from '../common/stringUtils';
+import { prefixString } from '../common/util/stringUtils';
 import EditItemView from '../EditItemView';
 import EditAttributesView from '../attributes/EditAttributesView';
-import { useAttributePreference } from '../common/preferences';
+import { useAttributePreference } from '../common/util/preferences';
 import {
   speedFromKnots, speedToKnots, distanceFromMeters, distanceToMeters,
-} from '../common/converter';
+} from '../common/util/converter';
 import { useTranslation } from '../LocalizationProvider';
 import usePositionAttributes from '../attributes/usePositionAttributes';
 
diff --git a/modern/src/settings/MaintenancesPage.js b/modern/src/settings/MaintenancesPage.js
index 87207f0f..a5ef530e 100644
--- a/modern/src/settings/MaintenancesPage.js
+++ b/modern/src/settings/MaintenancesPage.js
@@ -7,8 +7,8 @@ import { useEffectAsync } from '../reactHelper';
 import EditCollectionView from '../EditCollectionView';
 
 import usePositionAttributes from '../attributes/usePositionAttributes';
-import { formatDistance, formatSpeed } from '../common/formatter';
-import { useAttributePreference } from '../common/preferences';
+import { formatDistance, formatSpeed } from '../common/util/formatter';
+import { useAttributePreference } from '../common/util/preferences';
 import OptionsLayout from './OptionsLayout';
 import { useTranslation } from '../LocalizationProvider';
 
diff --git a/modern/src/settings/NotificationPage.js b/modern/src/settings/NotificationPage.js
index 1e214ddd..3daa4e51 100644
--- a/modern/src/settings/NotificationPage.js
+++ b/modern/src/settings/NotificationPage.js
@@ -6,7 +6,7 @@ import {
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
 import { useTranslation, useTranslationKeys } from '../LocalizationProvider';
 import EditItemView from '../EditItemView';
-import { prefixString, unprefixString } from '../common/stringUtils';
+import { prefixString, unprefixString } from '../common/util/stringUtils';
 import SelectField from '../form/SelectField';
 
 const useStyles = makeStyles(() => ({
diff --git a/modern/src/settings/NotificationsPage.js b/modern/src/settings/NotificationsPage.js
index 965e8c33..9bc553d6 100644
--- a/modern/src/settings/NotificationsPage.js
+++ b/modern/src/settings/NotificationsPage.js
@@ -5,8 +5,8 @@ import {
 import MoreVertIcon from '@material-ui/icons/MoreVert';
 import { useEffectAsync } from '../reactHelper';
 import EditCollectionView from '../EditCollectionView';
-import { prefixString } from '../common/stringUtils';
-import { formatBoolean } from '../common/formatter';
+import { prefixString } from '../common/util/stringUtils';
+import { formatBoolean } from '../common/util/formatter';
 import OptionsLayout from './OptionsLayout';
 import { useTranslation } from '../LocalizationProvider';
 
diff --git a/modern/src/settings/OptionsLayout.js b/modern/src/settings/OptionsLayout.js
index c70ef7fe..b427d0c0 100644
--- a/modern/src/settings/OptionsLayout.js
+++ b/modern/src/settings/OptionsLayout.js
@@ -23,10 +23,10 @@ import BarChartIcon from '@material-ui/icons/BarChart';
 import TodayIcon from '@material-ui/icons/Today';
 import ExitToAppIcon from '@material-ui/icons/ExitToApp';
 
-import SideNav from '../components/SideNav';
-import NavBar from '../components/NavBar';
+import SideNav from '../common/components/SideNav';
+import NavBar from '../common/components/NavBar';
 import { useTranslation } from '../LocalizationProvider';
-import { useAdministrator, useReadonly } from '../common/permissions';
+import { useAdministrator, useReadonly } from '../common/util/permissions';
 
 const useStyles = makeStyles((theme) => ({
   root: {
diff --git a/modern/src/settings/PreferencesPage.js b/modern/src/settings/PreferencesPage.js
index 3c7862c7..bd03f8d2 100644
--- a/modern/src/settings/PreferencesPage.js
+++ b/modern/src/settings/PreferencesPage.js
@@ -5,7 +5,7 @@ import {
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
 import { useLocalization, useTranslation } from '../LocalizationProvider';
 import OptionsLayout from './OptionsLayout';
-import usePersistedState from '../common/usePersistedState';
+import usePersistedState from '../common/util/usePersistedState';
 
 const useStyles = makeStyles((theme) => ({
   container: {