27 files changed, 77 insertions, 76 deletions
diff --git a/modern/src/common/components/LocalizationProvider.js b/modern/src/common/components/LocalizationProvider.js
index db3e1fb9..9cc1d65a 100644
--- a/modern/src/common/components/LocalizationProvider.js
+++ b/modern/src/common/components/LocalizationProvider.js
@@ -5,60 +5,60 @@ import React, {
 import moment from 'moment';
 import 'moment/min/locales.min';
 
-import af from '../../../../web/l10n/af.json';
-import ar from '../../../../web/l10n/ar.json';
-import az from '../../../../web/l10n/az.json';
-import bg from '../../../../web/l10n/bg.json';
-import bn from '../../../../web/l10n/bn.json';
-import cs from '../../../../web/l10n/cs.json';
-import da from '../../../../web/l10n/da.json';
-import de from '../../../../web/l10n/de.json';
-import el from '../../../../web/l10n/el.json';
-import en from '../../../../web/l10n/en.json';
-import es from '../../../../web/l10n/es.json';
-import fa from '../../../../web/l10n/fa.json';
-import fi from '../../../../web/l10n/fi.json';
-import fr from '../../../../web/l10n/fr.json';
-import he from '../../../../web/l10n/he.json';
-import hi from '../../../../web/l10n/hi.json';
-import hr from '../../../../web/l10n/hr.json';
-import hu from '../../../../web/l10n/hu.json';
-import id from '../../../../web/l10n/id.json';
-import it from '../../../../web/l10n/it.json';
-import ja from '../../../../web/l10n/ja.json';
-import ka from '../../../../web/l10n/ka.json';
-import kk from '../../../../web/l10n/kk.json';
-import km from '../../../../web/l10n/km.json';
-import ko from '../../../../web/l10n/ko.json';
-import lo from '../../../../web/l10n/lo.json';
-import lt from '../../../../web/l10n/lt.json';
-import lv from '../../../../web/l10n/lv.json';
-import ml from '../../../../web/l10n/ml.json';
-import mn from '../../../../web/l10n/mn.json';
-import ms from '../../../../web/l10n/ms.json';
-import nb from '../../../../web/l10n/nb.json';
-import ne from '../../../../web/l10n/ne.json';
-import nl from '../../../../web/l10n/nl.json';
-import nn from '../../../../web/l10n/nn.json';
-import pl from '../../../../web/l10n/pl.json';
-import pt from '../../../../web/l10n/pt.json';
-import ptBR from '../../../../web/l10n/pt_BR.json';
-import ro from '../../../../web/l10n/ro.json';
-import ru from '../../../../web/l10n/ru.json';
-import si from '../../../../web/l10n/si.json';
-import sk from '../../../../web/l10n/sk.json';
-import sl from '../../../../web/l10n/sl.json';
-import sq from '../../../../web/l10n/sq.json';
-import sr from '../../../../web/l10n/sr.json';
-import sv from '../../../../web/l10n/sv.json';
-import ta from '../../../../web/l10n/ta.json';
-import th from '../../../../web/l10n/th.json';
-import tr from '../../../../web/l10n/tr.json';
-import uk from '../../../../web/l10n/uk.json';
-import uz from '../../../../web/l10n/uz.json';
-import vi from '../../../../web/l10n/vi.json';
-import zh from '../../../../web/l10n/zh.json';
-import zhTW from '../../../../web/l10n/zh_TW.json';
+import af from '../../resources/l10n/af.json';
+import ar from '../../resources/l10n/ar.json';
+import az from '../../resources/l10n/az.json';
+import bg from '../../resources/l10n/bg.json';
+import bn from '../../resources/l10n/bn.json';
+import cs from '../../resources/l10n/cs.json';
+import da from '../../resources/l10n/da.json';
+import de from '../../resources/l10n/de.json';
+import el from '../../resources/l10n/el.json';
+import en from '../../resources/l10n/en.json';
+import es from '../../resources/l10n/es.json';
+import fa from '../../resources/l10n/fa.json';
+import fi from '../../resources/l10n/fi.json';
+import fr from '../../resources/l10n/fr.json';
+import he from '../../resources/l10n/he.json';
+import hi from '../../resources/l10n/hi.json';
+import hr from '../../resources/l10n/hr.json';
+import hu from '../../resources/l10n/hu.json';
+import id from '../../resources/l10n/id.json';
+import it from '../../resources/l10n/it.json';
+import ja from '../../resources/l10n/ja.json';
+import ka from '../../resources/l10n/ka.json';
+import kk from '../../resources/l10n/kk.json';
+import km from '../../resources/l10n/km.json';
+import ko from '../../resources/l10n/ko.json';
+import lo from '../../resources/l10n/lo.json';
+import lt from '../../resources/l10n/lt.json';
+import lv from '../../resources/l10n/lv.json';
+import ml from '../../resources/l10n/ml.json';
+import mn from '../../resources/l10n/mn.json';
+import ms from '../../resources/l10n/ms.json';
+import nb from '../../resources/l10n/nb.json';
+import ne from '../../resources/l10n/ne.json';
+import nl from '../../resources/l10n/nl.json';
+import nn from '../../resources/l10n/nn.json';
+import pl from '../../resources/l10n/pl.json';
+import pt from '../../resources/l10n/pt.json';
+import ptBR from '../../resources/l10n/pt_BR.json';
+import ro from '../../resources/l10n/ro.json';
+import ru from '../../resources/l10n/ru.json';
+import si from '../../resources/l10n/si.json';
+import sk from '../../resources/l10n/sk.json';
+import sl from '../../resources/l10n/sl.json';
+import sq from '../../resources/l10n/sq.json';
+import sr from '../../resources/l10n/sr.json';
+import sv from '../../resources/l10n/sv.json';
+import ta from '../../resources/l10n/ta.json';
+import th from '../../resources/l10n/th.json';
+import tr from '../../resources/l10n/tr.json';
+import uk from '../../resources/l10n/uk.json';
+import uz from '../../resources/l10n/uz.json';
+import vi from '../../resources/l10n/vi.json';
+import zh from '../../resources/l10n/zh.json';
+import zhTW from '../../resources/l10n/zh_TW.json';
 import usePersistedState from '../util/usePersistedState';
 
 const languages = {
diff --git a/modern/src/map/core/preloadImages.js b/modern/src/map/core/preloadImages.js
index 24538146..e0cf42f2 100644
--- a/modern/src/map/core/preloadImages.js
+++ b/modern/src/map/core/preloadImages.js
@@ -1,28 +1,28 @@
 import palette from '../../common/theme/palette';
 import { loadImage, prepareIcon } from './mapUtil';
 
-import backgroundSvg from '../../../public/images/background.svg';
-import animalSvg from '../../../public/images/icon/animal.svg';
-import bicycleSvg from '../../../public/images/icon/bicycle.svg';
-import boatSvg from '../../../public/images/icon/boat.svg';
-import busSvg from '../../../public/images/icon/bus.svg';
-import carSvg from '../../../public/images/icon/car.svg';
-import craneSvg from '../../../public/images/icon/crane.svg';
-import defaultSvg from '../../../public/images/icon/default.svg';
-import helicopterSvg from '../../../public/images/icon/helicopter.svg';
-import motorcycleSvg from '../../../public/images/icon/motorcycle.svg';
-import offroadSvg from '../../../public/images/icon/offroad.svg';
-import personSvg from '../../../public/images/icon/person.svg';
-import pickupSvg from '../../../public/images/icon/pickup.svg';
-import planeSvg from '../../../public/images/icon/plane.svg';
-import scooterSvg from '../../../public/images/icon/scooter.svg';
-import shipSvg from '../../../public/images/icon/ship.svg';
-import tractorSvg from '../../../public/images/icon/tractor.svg';
-import trainSvg from '../../../public/images/icon/train.svg';
-import tramSvg from '../../../public/images/icon/tram.svg';
-import trolleybusSvg from '../../../public/images/icon/trolleybus.svg';
-import truckSvg from '../../../public/images/icon/truck.svg';
-import vanSvg from '../../../public/images/icon/van.svg';
+import backgroundSvg from '../../resources/images/background.svg';
+import animalSvg from '../../resources/images/icon/animal.svg';
+import bicycleSvg from '../../resources/images/icon/bicycle.svg';
+import boatSvg from '../../resources/images/icon/boat.svg';
+import busSvg from '../../resources/images/icon/bus.svg';
+import carSvg from '../../resources/images/icon/car.svg';
+import craneSvg from '../../resources/images/icon/crane.svg';
+import defaultSvg from '../../resources/images/icon/default.svg';
+import helicopterSvg from '../../resources/images/icon/helicopter.svg';
+import motorcycleSvg from '../../resources/images/icon/motorcycle.svg';
+import offroadSvg from '../../resources/images/icon/offroad.svg';
+import personSvg from '../../resources/images/icon/person.svg';
+import pickupSvg from '../../resources/images/icon/pickup.svg';
+import planeSvg from '../../resources/images/icon/plane.svg';
+import scooterSvg from '../../resources/images/icon/scooter.svg';
+import shipSvg from '../../resources/images/icon/ship.svg';
+import tractorSvg from '../../resources/images/icon/tractor.svg';
+import trainSvg from '../../resources/images/icon/train.svg';
+import tramSvg from '../../resources/images/icon/tram.svg';
+import trolleybusSvg from '../../resources/images/icon/trolleybus.svg';
+import truckSvg from '../../resources/images/icon/truck.svg';
+import vanSvg from '../../resources/images/icon/van.svg';
 
 export const mapIcons = {
   animal: animalSvg,
diff --git a/modern/public/alarm.mp3 b/modern/src/resources/alarm.mp3
index 43d3687e..43d3687e 100644
--- a/modern/public/alarm.mp3
+++ b/modern/src/resources/alarm.mp3
diff --git a/modern/public/images/background.svg b/modern/src/resources/images/background.svg
index 3dcb6870..3dcb6870 100644
--- a/modern/public/images/background.svg
+++ b/modern/src/resources/images/background.svg
diff --git a/modern/public/images/icon/animal.svg b/modern/src/resources/images/icon/animal.svg
index 5a239349..5a239349 100644
--- a/modern/public/images/icon/animal.svg
+++ b/modern/src/resources/images/icon/animal.svg
diff --git a/modern/public/images/icon/bicycle.svg b/modern/src/resources/images/icon/bicycle.svg
index a473f4bc..a473f4bc 100644
--- a/modern/public/images/icon/bicycle.svg
+++ b/modern/src/resources/images/icon/bicycle.svg
diff --git a/modern/public/images/icon/boat.svg b/modern/src/resources/images/icon/boat.svg
index 33bfe27d..33bfe27d 100644
--- a/modern/public/images/icon/boat.svg
+++ b/modern/src/resources/images/icon/boat.svg
diff --git a/modern/public/images/icon/bus.svg b/modern/src/resources/images/icon/bus.svg
index 5e881481..5e881481 100644
--- a/modern/public/images/icon/bus.svg
+++ b/modern/src/resources/images/icon/bus.svg
diff --git a/modern/public/images/icon/car.svg b/modern/src/resources/images/icon/car.svg
index f919e0be..f919e0be 100644
--- a/modern/public/images/icon/car.svg
+++ b/modern/src/resources/images/icon/car.svg
diff --git a/modern/public/images/icon/crane.svg b/modern/src/resources/images/icon/crane.svg
index 23db0916..23db0916 100644
--- a/modern/public/images/icon/crane.svg
+++ b/modern/src/resources/images/icon/crane.svg
diff --git a/modern/public/images/icon/default.svg b/modern/src/resources/images/icon/default.svg
index a4ba881f..a4ba881f 100644
--- a/modern/public/images/icon/default.svg
+++ b/modern/src/resources/images/icon/default.svg
diff --git a/modern/public/images/icon/helicopter.svg b/modern/src/resources/images/icon/helicopter.svg
index 2849ee8d..2849ee8d 100644
--- a/modern/public/images/icon/helicopter.svg
+++ b/modern/src/resources/images/icon/helicopter.svg
diff --git a/modern/public/images/icon/motorcycle.svg b/modern/src/resources/images/icon/motorcycle.svg
index 0289a346..0289a346 100644
--- a/modern/public/images/icon/motorcycle.svg
+++ b/modern/src/resources/images/icon/motorcycle.svg
diff --git a/modern/public/images/icon/offroad.svg b/modern/src/resources/images/icon/offroad.svg
index b0072b69..b0072b69 100644
--- a/modern/public/images/icon/offroad.svg
+++ b/modern/src/resources/images/icon/offroad.svg
diff --git a/modern/public/images/icon/person.svg b/modern/src/resources/images/icon/person.svg
index 805ba442..805ba442 100644
--- a/modern/public/images/icon/person.svg
+++ b/modern/src/resources/images/icon/person.svg
diff --git a/modern/public/images/icon/pickup.svg b/modern/src/resources/images/icon/pickup.svg
index db4494b7..db4494b7 100644
--- a/modern/public/images/icon/pickup.svg
+++ b/modern/src/resources/images/icon/pickup.svg
diff --git a/modern/public/images/icon/plane.svg b/modern/src/resources/images/icon/plane.svg
index 5210e4c9..5210e4c9 100644
--- a/modern/public/images/icon/plane.svg
+++ b/modern/src/resources/images/icon/plane.svg
diff --git a/modern/public/images/icon/scooter.svg b/modern/src/resources/images/icon/scooter.svg
index ea23f9fa..ea23f9fa 100644
--- a/modern/public/images/icon/scooter.svg
+++ b/modern/src/resources/images/icon/scooter.svg
diff --git a/modern/public/images/icon/ship.svg b/modern/src/resources/images/icon/ship.svg
index b8c563c8..b8c563c8 100644
--- a/modern/public/images/icon/ship.svg
+++ b/modern/src/resources/images/icon/ship.svg
diff --git a/modern/public/images/icon/tractor.svg b/modern/src/resources/images/icon/tractor.svg
index 3a9e9f25..3a9e9f25 100644
--- a/modern/public/images/icon/tractor.svg
+++ b/modern/src/resources/images/icon/tractor.svg
diff --git a/modern/public/images/icon/train.svg b/modern/src/resources/images/icon/train.svg
index 125b468e..125b468e 100644
--- a/modern/public/images/icon/train.svg
+++ b/modern/src/resources/images/icon/train.svg
diff --git a/modern/public/images/icon/tram.svg b/modern/src/resources/images/icon/tram.svg
index f54084f7..f54084f7 100644
--- a/modern/public/images/icon/tram.svg
+++ b/modern/src/resources/images/icon/tram.svg
diff --git a/modern/public/images/icon/trolleybus.svg b/modern/src/resources/images/icon/trolleybus.svg
index 46ecc712..46ecc712 100644
--- a/modern/public/images/icon/trolleybus.svg
+++ b/modern/src/resources/images/icon/trolleybus.svg
diff --git a/modern/public/images/icon/truck.svg b/modern/src/resources/images/icon/truck.svg
index df5c164c..df5c164c 100644
--- a/modern/public/images/icon/truck.svg
+++ b/modern/src/resources/images/icon/truck.svg
diff --git a/modern/public/images/icon/van.svg b/modern/src/resources/images/icon/van.svg
index a3ee13c7..a3ee13c7 100644
--- a/modern/public/images/icon/van.svg
+++ b/modern/src/resources/images/icon/van.svg
diff --git a/modern/public/logo.svg b/modern/src/resources/images/logo.svg
index 8183831f..8183831f 100644
--- a/modern/public/logo.svg
+++ b/modern/src/resources/images/logo.svg
diff --git a/modern/src/resources/l10n b/modern/src/resources/l10n
new file mode 120000
index 00000000..11bf5a89
--- /dev/null
+++ b/modern/src/resources/l10n
@@ -0,0 +1 @@
+../../../web/l10n
+\ No newline at end of file