diff --git a/packages/mapviewer/.env.development b/packages/viewer/.env.development
similarity index 100%
rename from packages/mapviewer/.env.development
rename to packages/viewer/.env.development
diff --git a/packages/mapviewer/.env.integration b/packages/viewer/.env.integration
similarity index 100%
rename from packages/mapviewer/.env.integration
rename to packages/viewer/.env.integration
diff --git a/packages/mapviewer/.env.production b/packages/viewer/.env.production
similarity index 100%
rename from packages/mapviewer/.env.production
rename to packages/viewer/.env.production
diff --git a/packages/mapviewer/.env.test b/packages/viewer/.env.test
similarity index 100%
rename from packages/mapviewer/.env.test
rename to packages/viewer/.env.test
diff --git a/packages/mapviewer/cypress.config.mjs b/packages/viewer/cypress.config.mjs
similarity index 100%
rename from packages/mapviewer/cypress.config.mjs
rename to packages/viewer/cypress.config.mjs
diff --git a/packages/mapviewer/index.html b/packages/viewer/index.html
similarity index 100%
rename from packages/mapviewer/index.html
rename to packages/viewer/index.html
diff --git a/packages/mapviewer/package.json b/packages/viewer/package.json
similarity index 100%
rename from packages/mapviewer/package.json
rename to packages/viewer/package.json
diff --git a/packages/mapviewer/public/apple-touch-icon.png b/packages/viewer/public/apple-touch-icon.png
similarity index 100%
rename from packages/mapviewer/public/apple-touch-icon.png
rename to packages/viewer/public/apple-touch-icon.png
diff --git a/packages/mapviewer/public/favicon.ico b/packages/viewer/public/favicon.ico
similarity index 100%
rename from packages/mapviewer/public/favicon.ico
rename to packages/viewer/public/favicon.ico
diff --git a/packages/mapviewer/public/icon-192.png b/packages/viewer/public/icon-192.png
similarity index 100%
rename from packages/mapviewer/public/icon-192.png
rename to packages/viewer/public/icon-192.png
diff --git a/packages/mapviewer/public/icon-512.png b/packages/viewer/public/icon-512.png
similarity index 100%
rename from packages/mapviewer/public/icon-512.png
rename to packages/viewer/public/icon-512.png
diff --git a/packages/mapviewer/public/icon.svg b/packages/viewer/public/icon.svg
similarity index 100%
rename from packages/mapviewer/public/icon.svg
rename to packages/viewer/public/icon.svg
diff --git a/packages/mapviewer/public/robots.txt b/packages/viewer/public/robots.txt
similarity index 100%
rename from packages/mapviewer/public/robots.txt
rename to packages/viewer/public/robots.txt
diff --git a/packages/mapviewer/pwa-assets.config.ts b/packages/viewer/pwa-assets.config.ts
similarity index 100%
rename from packages/mapviewer/pwa-assets.config.ts
rename to packages/viewer/pwa-assets.config.ts
diff --git a/packages/mapviewer/scripts/check-external-layers-providers.js b/packages/viewer/scripts/check-external-layers-providers.js
similarity index 100%
rename from packages/mapviewer/scripts/check-external-layers-providers.js
rename to packages/viewer/scripts/check-external-layers-providers.js
diff --git a/packages/mapviewer/scripts/generate-i18n-files.js b/packages/viewer/scripts/generate-i18n-files.js
similarity index 100%
rename from packages/mapviewer/scripts/generate-i18n-files.js
rename to packages/viewer/scripts/generate-i18n-files.js
diff --git a/packages/mapviewer/secrets.yml b/packages/viewer/secrets.yml
similarity index 100%
rename from packages/mapviewer/secrets.yml
rename to packages/viewer/secrets.yml
diff --git a/packages/mapviewer/src/App.vue b/packages/viewer/src/App.vue
similarity index 100%
rename from packages/mapviewer/src/App.vue
rename to packages/viewer/src/App.vue
diff --git a/packages/mapviewer/src/api/__tests__/file-proxy.api.spec.js b/packages/viewer/src/api/__tests__/file-proxy.api.spec.js
similarity index 100%
rename from packages/mapviewer/src/api/__tests__/file-proxy.api.spec.js
rename to packages/viewer/src/api/__tests__/file-proxy.api.spec.js
diff --git a/packages/mapviewer/src/api/__tests__/print.api.spec.js b/packages/viewer/src/api/__tests__/print.api.spec.js
similarity index 100%
rename from packages/mapviewer/src/api/__tests__/print.api.spec.js
rename to packages/viewer/src/api/__tests__/print.api.spec.js
diff --git a/packages/mapviewer/src/api/__tests__/search.api.spec.js b/packages/viewer/src/api/__tests__/search.api.spec.js
similarity index 100%
rename from packages/mapviewer/src/api/__tests__/search.api.spec.js
rename to packages/viewer/src/api/__tests__/search.api.spec.js
diff --git a/packages/mapviewer/src/api/errorQueues.api.js b/packages/viewer/src/api/errorQueues.api.js
similarity index 100%
rename from packages/mapviewer/src/api/errorQueues.api.js
rename to packages/viewer/src/api/errorQueues.api.js
diff --git a/packages/mapviewer/src/api/features/EditableFeature.class.js b/packages/viewer/src/api/features/EditableFeature.class.js
similarity index 100%
rename from packages/mapviewer/src/api/features/EditableFeature.class.js
rename to packages/viewer/src/api/features/EditableFeature.class.js
diff --git a/packages/mapviewer/src/api/features/LayerFeature.class.js b/packages/viewer/src/api/features/LayerFeature.class.js
similarity index 100%
rename from packages/mapviewer/src/api/features/LayerFeature.class.js
rename to packages/viewer/src/api/features/LayerFeature.class.js
diff --git a/packages/mapviewer/src/api/features/SelectableFeature.class.js b/packages/viewer/src/api/features/SelectableFeature.class.js
similarity index 100%
rename from packages/mapviewer/src/api/features/SelectableFeature.class.js
rename to packages/viewer/src/api/features/SelectableFeature.class.js
diff --git a/packages/mapviewer/src/api/features/features.api.js b/packages/viewer/src/api/features/features.api.js
similarity index 100%
rename from packages/mapviewer/src/api/features/features.api.js
rename to packages/viewer/src/api/features/features.api.js
diff --git a/packages/mapviewer/src/api/feedback.api.js b/packages/viewer/src/api/feedback.api.js
similarity index 100%
rename from packages/mapviewer/src/api/feedback.api.js
rename to packages/viewer/src/api/feedback.api.js
diff --git a/packages/mapviewer/src/api/file-proxy.api.js b/packages/viewer/src/api/file-proxy.api.js
similarity index 100%
rename from packages/mapviewer/src/api/file-proxy.api.js
rename to packages/viewer/src/api/file-proxy.api.js
diff --git a/packages/mapviewer/src/api/files.api.js b/packages/viewer/src/api/files.api.js
similarity index 100%
rename from packages/mapviewer/src/api/files.api.js
rename to packages/viewer/src/api/files.api.js
diff --git a/packages/mapviewer/src/api/height.api.js b/packages/viewer/src/api/height.api.js
similarity index 100%
rename from packages/mapviewer/src/api/height.api.js
rename to packages/viewer/src/api/height.api.js
diff --git a/packages/mapviewer/src/api/icon.api.js b/packages/viewer/src/api/icon.api.js
similarity index 100%
rename from packages/mapviewer/src/api/icon.api.js
rename to packages/viewer/src/api/icon.api.js
diff --git a/packages/mapviewer/src/api/iframePostMessageEvent.api.js b/packages/viewer/src/api/iframePostMessageEvent.api.js
similarity index 100%
rename from packages/mapviewer/src/api/iframePostMessageEvent.api.js
rename to packages/viewer/src/api/iframePostMessageEvent.api.js
diff --git a/packages/mapviewer/src/api/layers/AbstractLayer.class.js b/packages/viewer/src/api/layers/AbstractLayer.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/AbstractLayer.class.js
rename to packages/viewer/src/api/layers/AbstractLayer.class.js
diff --git a/packages/mapviewer/src/api/layers/CloudOptimizedGeoTIFFLayer.class.js b/packages/viewer/src/api/layers/CloudOptimizedGeoTIFFLayer.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/CloudOptimizedGeoTIFFLayer.class.js
rename to packages/viewer/src/api/layers/CloudOptimizedGeoTIFFLayer.class.js
diff --git a/packages/mapviewer/src/api/layers/ExternalLayer.class.js b/packages/viewer/src/api/layers/ExternalLayer.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/ExternalLayer.class.js
rename to packages/viewer/src/api/layers/ExternalLayer.class.js
diff --git a/packages/mapviewer/src/api/layers/ExternalWMSLayer.class.js b/packages/viewer/src/api/layers/ExternalWMSLayer.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/ExternalWMSLayer.class.js
rename to packages/viewer/src/api/layers/ExternalWMSLayer.class.js
diff --git a/packages/mapviewer/src/api/layers/ExternalWMTSLayer.class.js b/packages/viewer/src/api/layers/ExternalWMTSLayer.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/ExternalWMTSLayer.class.js
rename to packages/viewer/src/api/layers/ExternalWMTSLayer.class.js
diff --git a/packages/mapviewer/src/api/layers/GPXLayer.class.js b/packages/viewer/src/api/layers/GPXLayer.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/GPXLayer.class.js
rename to packages/viewer/src/api/layers/GPXLayer.class.js
diff --git a/packages/mapviewer/src/api/layers/GeoAdmin3DLayer.class.js b/packages/viewer/src/api/layers/GeoAdmin3DLayer.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/GeoAdmin3DLayer.class.js
rename to packages/viewer/src/api/layers/GeoAdmin3DLayer.class.js
diff --git a/packages/mapviewer/src/api/layers/GeoAdminAggregateLayer.class.js b/packages/viewer/src/api/layers/GeoAdminAggregateLayer.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/GeoAdminAggregateLayer.class.js
rename to packages/viewer/src/api/layers/GeoAdminAggregateLayer.class.js
diff --git a/packages/mapviewer/src/api/layers/GeoAdminGeoJsonLayer.class.js b/packages/viewer/src/api/layers/GeoAdminGeoJsonLayer.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/GeoAdminGeoJsonLayer.class.js
rename to packages/viewer/src/api/layers/GeoAdminGeoJsonLayer.class.js
diff --git a/packages/mapviewer/src/api/layers/GeoAdminGroupOfLayers.class.js b/packages/viewer/src/api/layers/GeoAdminGroupOfLayers.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/GeoAdminGroupOfLayers.class.js
rename to packages/viewer/src/api/layers/GeoAdminGroupOfLayers.class.js
diff --git a/packages/mapviewer/src/api/layers/GeoAdminLayer.class.js b/packages/viewer/src/api/layers/GeoAdminLayer.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/GeoAdminLayer.class.js
rename to packages/viewer/src/api/layers/GeoAdminLayer.class.js
diff --git a/packages/mapviewer/src/api/layers/GeoAdminVectorLayer.class.js b/packages/viewer/src/api/layers/GeoAdminVectorLayer.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/GeoAdminVectorLayer.class.js
rename to packages/viewer/src/api/layers/GeoAdminVectorLayer.class.js
diff --git a/packages/mapviewer/src/api/layers/GeoAdminWMSLayer.class.js b/packages/viewer/src/api/layers/GeoAdminWMSLayer.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/GeoAdminWMSLayer.class.js
rename to packages/viewer/src/api/layers/GeoAdminWMSLayer.class.js
diff --git a/packages/mapviewer/src/api/layers/GeoAdminWMTSLayer.class.js b/packages/viewer/src/api/layers/GeoAdminWMTSLayer.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/GeoAdminWMTSLayer.class.js
rename to packages/viewer/src/api/layers/GeoAdminWMTSLayer.class.js
diff --git a/packages/mapviewer/src/api/layers/InvalidLayerData.error.js b/packages/viewer/src/api/layers/InvalidLayerData.error.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/InvalidLayerData.error.js
rename to packages/viewer/src/api/layers/InvalidLayerData.error.js
diff --git a/packages/mapviewer/src/api/layers/KMLLayer.class.js b/packages/viewer/src/api/layers/KMLLayer.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/KMLLayer.class.js
rename to packages/viewer/src/api/layers/KMLLayer.class.js
diff --git a/packages/mapviewer/src/api/layers/KmlStyles.enum.js b/packages/viewer/src/api/layers/KmlStyles.enum.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/KmlStyles.enum.js
rename to packages/viewer/src/api/layers/KmlStyles.enum.js
diff --git a/packages/mapviewer/src/api/layers/LayerTimeConfig.class.js b/packages/viewer/src/api/layers/LayerTimeConfig.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/LayerTimeConfig.class.js
rename to packages/viewer/src/api/layers/LayerTimeConfig.class.js
diff --git a/packages/mapviewer/src/api/layers/LayerTimeConfigEntry.class.js b/packages/viewer/src/api/layers/LayerTimeConfigEntry.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/LayerTimeConfigEntry.class.js
rename to packages/viewer/src/api/layers/LayerTimeConfigEntry.class.js
diff --git a/packages/mapviewer/src/api/layers/LayerTypes.enum.js b/packages/viewer/src/api/layers/LayerTypes.enum.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/LayerTypes.enum.js
rename to packages/viewer/src/api/layers/LayerTypes.enum.js
diff --git a/packages/mapviewer/src/api/layers/WMSCapabilitiesParser.class.js b/packages/viewer/src/api/layers/WMSCapabilitiesParser.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/WMSCapabilitiesParser.class.js
rename to packages/viewer/src/api/layers/WMSCapabilitiesParser.class.js
diff --git a/packages/mapviewer/src/api/layers/WMTSCapabilitiesParser.class.js b/packages/viewer/src/api/layers/WMTSCapabilitiesParser.class.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/WMTSCapabilitiesParser.class.js
rename to packages/viewer/src/api/layers/WMTSCapabilitiesParser.class.js
diff --git a/packages/mapviewer/src/api/layers/__tests__/KMLLayer.class.spec.js b/packages/viewer/src/api/layers/__tests__/KMLLayer.class.spec.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/__tests__/KMLLayer.class.spec.js
rename to packages/viewer/src/api/layers/__tests__/KMLLayer.class.spec.js
diff --git a/packages/mapviewer/src/api/layers/__tests__/WMSCapabitliesParser.class.spec.js b/packages/viewer/src/api/layers/__tests__/WMSCapabitliesParser.class.spec.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/__tests__/WMSCapabitliesParser.class.spec.js
rename to packages/viewer/src/api/layers/__tests__/WMSCapabitliesParser.class.spec.js
diff --git a/packages/mapviewer/src/api/layers/__tests__/WMTSCapabitliesParser.class.spec.js b/packages/viewer/src/api/layers/__tests__/WMTSCapabitliesParser.class.spec.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/__tests__/WMTSCapabitliesParser.class.spec.js
rename to packages/viewer/src/api/layers/__tests__/WMTSCapabitliesParser.class.spec.js
diff --git a/packages/mapviewer/src/api/layers/__tests__/wms-geoadmin-sample-sld-enabled.xml b/packages/viewer/src/api/layers/__tests__/wms-geoadmin-sample-sld-enabled.xml
similarity index 100%
rename from packages/mapviewer/src/api/layers/__tests__/wms-geoadmin-sample-sld-enabled.xml
rename to packages/viewer/src/api/layers/__tests__/wms-geoadmin-sample-sld-enabled.xml
diff --git a/packages/mapviewer/src/api/layers/__tests__/wms-geoadmin-sample.xml b/packages/viewer/src/api/layers/__tests__/wms-geoadmin-sample.xml
similarity index 100%
rename from packages/mapviewer/src/api/layers/__tests__/wms-geoadmin-sample.xml
rename to packages/viewer/src/api/layers/__tests__/wms-geoadmin-sample.xml
diff --git a/packages/mapviewer/src/api/layers/__tests__/wmts-ogc-sample.xml b/packages/viewer/src/api/layers/__tests__/wmts-ogc-sample.xml
similarity index 100%
rename from packages/mapviewer/src/api/layers/__tests__/wmts-ogc-sample.xml
rename to packages/viewer/src/api/layers/__tests__/wmts-ogc-sample.xml
diff --git a/packages/mapviewer/src/api/layers/layers-external.api.js b/packages/viewer/src/api/layers/layers-external.api.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/layers-external.api.js
rename to packages/viewer/src/api/layers/layers-external.api.js
diff --git a/packages/mapviewer/src/api/layers/layers.api.js b/packages/viewer/src/api/layers/layers.api.js
similarity index 100%
rename from packages/mapviewer/src/api/layers/layers.api.js
rename to packages/viewer/src/api/layers/layers.api.js
diff --git a/packages/mapviewer/src/api/lv03Reframe.api.js b/packages/viewer/src/api/lv03Reframe.api.js
similarity index 100%
rename from packages/mapviewer/src/api/lv03Reframe.api.js
rename to packages/viewer/src/api/lv03Reframe.api.js
diff --git a/packages/mapviewer/src/api/print.api.js b/packages/viewer/src/api/print.api.js
similarity index 100%
rename from packages/mapviewer/src/api/print.api.js
rename to packages/viewer/src/api/print.api.js
diff --git a/packages/mapviewer/src/api/qrcode.api.js b/packages/viewer/src/api/qrcode.api.js
similarity index 100%
rename from packages/mapviewer/src/api/qrcode.api.js
rename to packages/viewer/src/api/qrcode.api.js
diff --git a/packages/mapviewer/src/api/search.api.js b/packages/viewer/src/api/search.api.js
similarity index 100%
rename from packages/mapviewer/src/api/search.api.js
rename to packages/viewer/src/api/search.api.js
diff --git a/packages/mapviewer/src/api/shortlink.api.js b/packages/viewer/src/api/shortlink.api.js
similarity index 100%
rename from packages/mapviewer/src/api/shortlink.api.js
rename to packages/viewer/src/api/shortlink.api.js
diff --git a/packages/mapviewer/src/api/topics.api.js b/packages/viewer/src/api/topics.api.js
similarity index 100%
rename from packages/mapviewer/src/api/topics.api.js
rename to packages/viewer/src/api/topics.api.js
diff --git a/packages/mapviewer/src/api/what3words.api.js b/packages/viewer/src/api/what3words.api.js
similarity index 100%
rename from packages/mapviewer/src/api/what3words.api.js
rename to packages/viewer/src/api/what3words.api.js
diff --git a/packages/mapviewer/src/assets/grid.png b/packages/viewer/src/assets/grid.png
similarity index 100%
rename from packages/mapviewer/src/assets/grid.png
rename to packages/viewer/src/assets/grid.png
diff --git a/packages/mapviewer/src/assets/logo.png b/packages/viewer/src/assets/logo.png
similarity index 100%
rename from packages/mapviewer/src/assets/logo.png
rename to packages/viewer/src/assets/logo.png
diff --git a/packages/mapviewer/src/assets/svg/swiss-flag.svg b/packages/viewer/src/assets/svg/swiss-flag.svg
similarity index 100%
rename from packages/mapviewer/src/assets/svg/swiss-flag.svg
rename to packages/viewer/src/assets/svg/swiss-flag.svg
diff --git a/packages/mapviewer/src/config/baseUrl.config.js b/packages/viewer/src/config/baseUrl.config.js
similarity index 100%
rename from packages/mapviewer/src/config/baseUrl.config.js
rename to packages/viewer/src/config/baseUrl.config.js
diff --git a/packages/mapviewer/src/config/cesium.config.js b/packages/viewer/src/config/cesium.config.js
similarity index 100%
rename from packages/mapviewer/src/config/cesium.config.js
rename to packages/viewer/src/config/cesium.config.js
diff --git a/packages/mapviewer/src/config/feedback.config.js b/packages/viewer/src/config/feedback.config.js
similarity index 100%
rename from packages/mapviewer/src/config/feedback.config.js
rename to packages/viewer/src/config/feedback.config.js
diff --git a/packages/mapviewer/src/config/map.config.js b/packages/viewer/src/config/map.config.js
similarity index 100%
rename from packages/mapviewer/src/config/map.config.js
rename to packages/viewer/src/config/map.config.js
diff --git a/packages/mapviewer/src/config/print.config.js b/packages/viewer/src/config/print.config.js
similarity index 100%
rename from packages/mapviewer/src/config/print.config.js
rename to packages/viewer/src/config/print.config.js
diff --git a/packages/mapviewer/src/config/regex.config.ts b/packages/viewer/src/config/regex.config.ts
similarity index 100%
rename from packages/mapviewer/src/config/regex.config.ts
rename to packages/viewer/src/config/regex.config.ts
diff --git a/packages/mapviewer/src/config/responsive.config.js b/packages/viewer/src/config/responsive.config.js
similarity index 100%
rename from packages/mapviewer/src/config/responsive.config.js
rename to packages/viewer/src/config/responsive.config.js
diff --git a/packages/mapviewer/src/config/security.config.js b/packages/viewer/src/config/security.config.js
similarity index 100%
rename from packages/mapviewer/src/config/security.config.js
rename to packages/viewer/src/config/security.config.js
diff --git a/packages/mapviewer/src/config/staging.config.ts b/packages/viewer/src/config/staging.config.ts
similarity index 100%
rename from packages/mapviewer/src/config/staging.config.ts
rename to packages/viewer/src/config/staging.config.ts
diff --git a/packages/mapviewer/src/config/time.config.js b/packages/viewer/src/config/time.config.js
similarity index 100%
rename from packages/mapviewer/src/config/time.config.js
rename to packages/viewer/src/config/time.config.js
diff --git a/packages/mapviewer/src/config/vectortiles.config.js b/packages/viewer/src/config/vectortiles.config.js
similarity index 100%
rename from packages/mapviewer/src/config/vectortiles.config.js
rename to packages/viewer/src/config/vectortiles.config.js
diff --git a/packages/mapviewer/src/css/tailwind.css b/packages/viewer/src/css/tailwind.css
similarity index 100%
rename from packages/mapviewer/src/css/tailwind.css
rename to packages/viewer/src/css/tailwind.css
diff --git a/packages/mapviewer/src/main.js b/packages/viewer/src/main.js
similarity index 100%
rename from packages/mapviewer/src/main.js
rename to packages/viewer/src/main.js
diff --git a/packages/mapviewer/src/modules/drawing/DrawingModule.vue b/packages/viewer/src/modules/drawing/DrawingModule.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/DrawingModule.vue
rename to packages/viewer/src/modules/drawing/DrawingModule.vue
diff --git a/packages/mapviewer/src/modules/drawing/README.md b/packages/viewer/src/modules/drawing/README.md
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/README.md
rename to packages/viewer/src/modules/drawing/README.md
diff --git a/packages/mapviewer/src/modules/drawing/components/AddVertexButton.vue b/packages/viewer/src/modules/drawing/components/AddVertexButton.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/AddVertexButton.vue
rename to packages/viewer/src/modules/drawing/components/AddVertexButton.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/AddVertexButtonOverlay.vue b/packages/viewer/src/modules/drawing/components/AddVertexButtonOverlay.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/AddVertexButtonOverlay.vue
rename to packages/viewer/src/modules/drawing/components/AddVertexButtonOverlay.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/DrawingExporter.vue b/packages/viewer/src/modules/drawing/components/DrawingExporter.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/DrawingExporter.vue
rename to packages/viewer/src/modules/drawing/components/DrawingExporter.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/DrawingHeader.vue b/packages/viewer/src/modules/drawing/components/DrawingHeader.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/DrawingHeader.vue
rename to packages/viewer/src/modules/drawing/components/DrawingHeader.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/DrawingInteractions.vue b/packages/viewer/src/modules/drawing/components/DrawingInteractions.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/DrawingInteractions.vue
rename to packages/viewer/src/modules/drawing/components/DrawingInteractions.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/DrawingLineInteraction.vue b/packages/viewer/src/modules/drawing/components/DrawingLineInteraction.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/DrawingLineInteraction.vue
rename to packages/viewer/src/modules/drawing/components/DrawingLineInteraction.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/DrawingMarkerInteraction.vue b/packages/viewer/src/modules/drawing/components/DrawingMarkerInteraction.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/DrawingMarkerInteraction.vue
rename to packages/viewer/src/modules/drawing/components/DrawingMarkerInteraction.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/DrawingMeasureInteraction.vue b/packages/viewer/src/modules/drawing/components/DrawingMeasureInteraction.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/DrawingMeasureInteraction.vue
rename to packages/viewer/src/modules/drawing/components/DrawingMeasureInteraction.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/DrawingSelectInteraction.vue b/packages/viewer/src/modules/drawing/components/DrawingSelectInteraction.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/DrawingSelectInteraction.vue
rename to packages/viewer/src/modules/drawing/components/DrawingSelectInteraction.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/DrawingTextInteraction.vue b/packages/viewer/src/modules/drawing/components/DrawingTextInteraction.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/DrawingTextInteraction.vue
rename to packages/viewer/src/modules/drawing/components/DrawingTextInteraction.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/DrawingToolbox.vue b/packages/viewer/src/modules/drawing/components/DrawingToolbox.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/DrawingToolbox.vue
rename to packages/viewer/src/modules/drawing/components/DrawingToolbox.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/DrawingToolboxButton.vue b/packages/viewer/src/modules/drawing/components/DrawingToolboxButton.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/DrawingToolboxButton.vue
rename to packages/viewer/src/modules/drawing/components/DrawingToolboxButton.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/DrawingTooltip.vue b/packages/viewer/src/modules/drawing/components/DrawingTooltip.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/DrawingTooltip.vue
rename to packages/viewer/src/modules/drawing/components/DrawingTooltip.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/ExtendLineInteraction.vue b/packages/viewer/src/modules/drawing/components/ExtendLineInteraction.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/ExtendLineInteraction.vue
rename to packages/viewer/src/modules/drawing/components/ExtendLineInteraction.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/ExtendMeasureInteraction.vue b/packages/viewer/src/modules/drawing/components/ExtendMeasureInteraction.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/ExtendMeasureInteraction.vue
rename to packages/viewer/src/modules/drawing/components/ExtendMeasureInteraction.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/SharePopup.vue b/packages/viewer/src/modules/drawing/components/SharePopup.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/SharePopup.vue
rename to packages/viewer/src/modules/drawing/components/SharePopup.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/ShareWarningPopup.vue b/packages/viewer/src/modules/drawing/components/ShareWarningPopup.vue
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/ShareWarningPopup.vue
rename to packages/viewer/src/modules/drawing/components/ShareWarningPopup.vue
diff --git a/packages/mapviewer/src/modules/drawing/components/useDrawingLineInteraction.composable.js b/packages/viewer/src/modules/drawing/components/useDrawingLineInteraction.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/useDrawingLineInteraction.composable.js
rename to packages/viewer/src/modules/drawing/components/useDrawingLineInteraction.composable.js
diff --git a/packages/mapviewer/src/modules/drawing/components/useDrawingModeInteraction.composable.js b/packages/viewer/src/modules/drawing/components/useDrawingModeInteraction.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/useDrawingModeInteraction.composable.js
rename to packages/viewer/src/modules/drawing/components/useDrawingModeInteraction.composable.js
diff --git a/packages/mapviewer/src/modules/drawing/components/useExtendLineInteraction.composable.js b/packages/viewer/src/modules/drawing/components/useExtendLineInteraction.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/useExtendLineInteraction.composable.js
rename to packages/viewer/src/modules/drawing/components/useExtendLineInteraction.composable.js
diff --git a/packages/mapviewer/src/modules/drawing/components/useModifyInteraction.composable.js b/packages/viewer/src/modules/drawing/components/useModifyInteraction.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/components/useModifyInteraction.composable.js
rename to packages/viewer/src/modules/drawing/components/useModifyInteraction.composable.js
diff --git a/packages/mapviewer/src/modules/drawing/lib/drawingUtils.js b/packages/viewer/src/modules/drawing/lib/drawingUtils.js
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/lib/drawingUtils.js
rename to packages/viewer/src/modules/drawing/lib/drawingUtils.js
diff --git a/packages/mapviewer/src/modules/drawing/lib/export-utils.js b/packages/viewer/src/modules/drawing/lib/export-utils.js
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/lib/export-utils.js
rename to packages/viewer/src/modules/drawing/lib/export-utils.js
diff --git a/packages/mapviewer/src/modules/drawing/lib/modifyInteraction.js b/packages/viewer/src/modules/drawing/lib/modifyInteraction.js
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/lib/modifyInteraction.js
rename to packages/viewer/src/modules/drawing/lib/modifyInteraction.js
diff --git a/packages/mapviewer/src/modules/drawing/lib/style.js b/packages/viewer/src/modules/drawing/lib/style.js
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/lib/style.js
rename to packages/viewer/src/modules/drawing/lib/style.js
diff --git a/packages/mapviewer/src/modules/drawing/useKmlDataManagement.composable.js b/packages/viewer/src/modules/drawing/useKmlDataManagement.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/drawing/useKmlDataManagement.composable.js
rename to packages/viewer/src/modules/drawing/useKmlDataManagement.composable.js
diff --git a/packages/mapviewer/src/modules/i18n/README.md b/packages/viewer/src/modules/i18n/README.md
similarity index 100%
rename from packages/mapviewer/src/modules/i18n/README.md
rename to packages/viewer/src/modules/i18n/README.md
diff --git a/packages/mapviewer/src/modules/i18n/index.js b/packages/viewer/src/modules/i18n/index.js
similarity index 100%
rename from packages/mapviewer/src/modules/i18n/index.js
rename to packages/viewer/src/modules/i18n/index.js
diff --git a/packages/mapviewer/src/modules/i18n/locales/de.json b/packages/viewer/src/modules/i18n/locales/de.json
similarity index 100%
rename from packages/mapviewer/src/modules/i18n/locales/de.json
rename to packages/viewer/src/modules/i18n/locales/de.json
diff --git a/packages/mapviewer/src/modules/i18n/locales/en.json b/packages/viewer/src/modules/i18n/locales/en.json
similarity index 100%
rename from packages/mapviewer/src/modules/i18n/locales/en.json
rename to packages/viewer/src/modules/i18n/locales/en.json
diff --git a/packages/mapviewer/src/modules/i18n/locales/fr.json b/packages/viewer/src/modules/i18n/locales/fr.json
similarity index 100%
rename from packages/mapviewer/src/modules/i18n/locales/fr.json
rename to packages/viewer/src/modules/i18n/locales/fr.json
diff --git a/packages/mapviewer/src/modules/i18n/locales/it.json b/packages/viewer/src/modules/i18n/locales/it.json
similarity index 100%
rename from packages/mapviewer/src/modules/i18n/locales/it.json
rename to packages/viewer/src/modules/i18n/locales/it.json
diff --git a/packages/mapviewer/src/modules/i18n/locales/rm.json b/packages/viewer/src/modules/i18n/locales/rm.json
similarity index 100%
rename from packages/mapviewer/src/modules/i18n/locales/rm.json
rename to packages/viewer/src/modules/i18n/locales/rm.json
diff --git a/packages/mapviewer/src/modules/infobox/DrawingStyleMediaTypes.enum.js b/packages/viewer/src/modules/infobox/DrawingStyleMediaTypes.enum.js
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/DrawingStyleMediaTypes.enum.js
rename to packages/viewer/src/modules/infobox/DrawingStyleMediaTypes.enum.js
diff --git a/packages/mapviewer/src/modules/infobox/InfoboxModule.vue b/packages/viewer/src/modules/infobox/InfoboxModule.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/InfoboxModule.vue
rename to packages/viewer/src/modules/infobox/InfoboxModule.vue
diff --git a/packages/mapviewer/src/modules/infobox/README.md b/packages/viewer/src/modules/infobox/README.md
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/README.md
rename to packages/viewer/src/modules/infobox/README.md
diff --git a/packages/mapviewer/src/modules/infobox/components/FeatureAreaInfo.vue b/packages/viewer/src/modules/infobox/components/FeatureAreaInfo.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/FeatureAreaInfo.vue
rename to packages/viewer/src/modules/infobox/components/FeatureAreaInfo.vue
diff --git a/packages/mapviewer/src/modules/infobox/components/FeatureDetail.vue b/packages/viewer/src/modules/infobox/components/FeatureDetail.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/FeatureDetail.vue
rename to packages/viewer/src/modules/infobox/components/FeatureDetail.vue
diff --git a/packages/mapviewer/src/modules/infobox/components/FeatureDetailDisclaimer.vue b/packages/viewer/src/modules/infobox/components/FeatureDetailDisclaimer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/FeatureDetailDisclaimer.vue
rename to packages/viewer/src/modules/infobox/components/FeatureDetailDisclaimer.vue
diff --git a/packages/mapviewer/src/modules/infobox/components/FeatureList.vue b/packages/viewer/src/modules/infobox/components/FeatureList.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/FeatureList.vue
rename to packages/viewer/src/modules/infobox/components/FeatureList.vue
diff --git a/packages/mapviewer/src/modules/infobox/components/FeatureListCategory.vue b/packages/viewer/src/modules/infobox/components/FeatureListCategory.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/FeatureListCategory.vue
rename to packages/viewer/src/modules/infobox/components/FeatureListCategory.vue
diff --git a/packages/mapviewer/src/modules/infobox/components/FeatureListCategoryItem.vue b/packages/viewer/src/modules/infobox/components/FeatureListCategoryItem.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/FeatureListCategoryItem.vue
rename to packages/viewer/src/modules/infobox/components/FeatureListCategoryItem.vue
diff --git a/packages/mapviewer/src/modules/infobox/components/InfoboxContent.vue b/packages/viewer/src/modules/infobox/components/InfoboxContent.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/InfoboxContent.vue
rename to packages/viewer/src/modules/infobox/components/InfoboxContent.vue
diff --git a/packages/mapviewer/src/modules/infobox/components/ShowGeometryProfileButton.vue b/packages/viewer/src/modules/infobox/components/ShowGeometryProfileButton.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/ShowGeometryProfileButton.vue
rename to packages/viewer/src/modules/infobox/components/ShowGeometryProfileButton.vue
diff --git a/packages/mapviewer/src/modules/infobox/components/styling/DrawingStyleColorSelector.vue b/packages/viewer/src/modules/infobox/components/styling/DrawingStyleColorSelector.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/styling/DrawingStyleColorSelector.vue
rename to packages/viewer/src/modules/infobox/components/styling/DrawingStyleColorSelector.vue
diff --git a/packages/mapviewer/src/modules/infobox/components/styling/DrawingStyleIcon.vue b/packages/viewer/src/modules/infobox/components/styling/DrawingStyleIcon.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/styling/DrawingStyleIcon.vue
rename to packages/viewer/src/modules/infobox/components/styling/DrawingStyleIcon.vue
diff --git a/packages/mapviewer/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue b/packages/viewer/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
rename to packages/viewer/src/modules/infobox/components/styling/DrawingStyleIconSelector.vue
diff --git a/packages/mapviewer/src/modules/infobox/components/styling/DrawingStyleMediaLink.vue b/packages/viewer/src/modules/infobox/components/styling/DrawingStyleMediaLink.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/styling/DrawingStyleMediaLink.vue
rename to packages/viewer/src/modules/infobox/components/styling/DrawingStyleMediaLink.vue
diff --git a/packages/mapviewer/src/modules/infobox/components/styling/DrawingStylePlacementSelector.vue b/packages/viewer/src/modules/infobox/components/styling/DrawingStylePlacementSelector.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/styling/DrawingStylePlacementSelector.vue
rename to packages/viewer/src/modules/infobox/components/styling/DrawingStylePlacementSelector.vue
diff --git a/packages/mapviewer/src/modules/infobox/components/styling/DrawingStylePopoverButton.vue b/packages/viewer/src/modules/infobox/components/styling/DrawingStylePopoverButton.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/styling/DrawingStylePopoverButton.vue
rename to packages/viewer/src/modules/infobox/components/styling/DrawingStylePopoverButton.vue
diff --git a/packages/mapviewer/src/modules/infobox/components/styling/DrawingStyleSizeSelector.vue b/packages/viewer/src/modules/infobox/components/styling/DrawingStyleSizeSelector.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/styling/DrawingStyleSizeSelector.vue
rename to packages/viewer/src/modules/infobox/components/styling/DrawingStyleSizeSelector.vue
diff --git a/packages/mapviewer/src/modules/infobox/components/styling/DrawingStyleTextColorSelector.vue b/packages/viewer/src/modules/infobox/components/styling/DrawingStyleTextColorSelector.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/styling/DrawingStyleTextColorSelector.vue
rename to packages/viewer/src/modules/infobox/components/styling/DrawingStyleTextColorSelector.vue
diff --git a/packages/mapviewer/src/modules/infobox/components/styling/FeatureStyleEdit.vue b/packages/viewer/src/modules/infobox/components/styling/FeatureStyleEdit.vue
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/components/styling/FeatureStyleEdit.vue
rename to packages/viewer/src/modules/infobox/components/styling/FeatureStyleEdit.vue
diff --git a/packages/mapviewer/src/modules/infobox/index.js b/packages/viewer/src/modules/infobox/index.js
similarity index 100%
rename from packages/mapviewer/src/modules/infobox/index.js
rename to packages/viewer/src/modules/infobox/index.js
diff --git a/packages/mapviewer/src/modules/map/MapModule.vue b/packages/viewer/src/modules/map/MapModule.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/MapModule.vue
rename to packages/viewer/src/modules/map/MapModule.vue
diff --git a/packages/mapviewer/src/modules/map/README.md b/packages/viewer/src/modules/map/README.md
similarity index 100%
rename from packages/mapviewer/src/modules/map/README.md
rename to packages/viewer/src/modules/map/README.md
diff --git a/packages/mapviewer/src/modules/map/assets/bowl.png b/packages/viewer/src/modules/map/assets/bowl.png
similarity index 100%
rename from packages/mapviewer/src/modules/map/assets/bowl.png
rename to packages/viewer/src/modules/map/assets/bowl.png
diff --git a/packages/mapviewer/src/modules/map/assets/ch.swisstopo.leichte-basiskarte_world-vt.png b/packages/viewer/src/modules/map/assets/ch.swisstopo.leichte-basiskarte_world-vt.png
similarity index 100%
rename from packages/mapviewer/src/modules/map/assets/ch.swisstopo.leichte-basiskarte_world-vt.png
rename to packages/viewer/src/modules/map/assets/ch.swisstopo.leichte-basiskarte_world-vt.png
diff --git a/packages/mapviewer/src/modules/map/assets/ch.swisstopo.pixelkarte-farbe.png b/packages/viewer/src/modules/map/assets/ch.swisstopo.pixelkarte-farbe.png
similarity index 100%
rename from packages/mapviewer/src/modules/map/assets/ch.swisstopo.pixelkarte-farbe.png
rename to packages/viewer/src/modules/map/assets/ch.swisstopo.pixelkarte-farbe.png
diff --git a/packages/mapviewer/src/modules/map/assets/ch.swisstopo.pixelkarte-grau.png b/packages/viewer/src/modules/map/assets/ch.swisstopo.pixelkarte-grau.png
similarity index 100%
rename from packages/mapviewer/src/modules/map/assets/ch.swisstopo.pixelkarte-grau.png
rename to packages/viewer/src/modules/map/assets/ch.swisstopo.pixelkarte-grau.png
diff --git a/packages/mapviewer/src/modules/map/assets/ch.swisstopo.swissimage.png b/packages/viewer/src/modules/map/assets/ch.swisstopo.swissimage.png
similarity index 100%
rename from packages/mapviewer/src/modules/map/assets/ch.swisstopo.swissimage.png
rename to packages/viewer/src/modules/map/assets/ch.swisstopo.swissimage.png
diff --git a/packages/mapviewer/src/modules/map/assets/ch.swisstopo.swissimage_3d.png b/packages/viewer/src/modules/map/assets/ch.swisstopo.swissimage_3d.png
similarity index 100%
rename from packages/mapviewer/src/modules/map/assets/ch.swisstopo.swissimage_3d.png
rename to packages/viewer/src/modules/map/assets/ch.swisstopo.swissimage_3d.png
diff --git a/packages/mapviewer/src/modules/map/assets/ch.swisstopo.swisstlm3d-karte-farbe_3d.png b/packages/viewer/src/modules/map/assets/ch.swisstopo.swisstlm3d-karte-farbe_3d.png
similarity index 100%
rename from packages/mapviewer/src/modules/map/assets/ch.swisstopo.swisstlm3d-karte-farbe_3d.png
rename to packages/viewer/src/modules/map/assets/ch.swisstopo.swisstlm3d-karte-farbe_3d.png
diff --git a/packages/mapviewer/src/modules/map/assets/ch.swisstopo.swisstlm3d-karte-grau_3d.png b/packages/viewer/src/modules/map/assets/ch.swisstopo.swisstlm3d-karte-grau_3d.png
similarity index 100%
rename from packages/mapviewer/src/modules/map/assets/ch.swisstopo.swisstlm3d-karte-grau_3d.png
rename to packages/viewer/src/modules/map/assets/ch.swisstopo.swisstlm3d-karte-grau_3d.png
diff --git a/packages/mapviewer/src/modules/map/assets/circle.png b/packages/viewer/src/modules/map/assets/circle.png
similarity index 100%
rename from packages/mapviewer/src/modules/map/assets/circle.png
rename to packages/viewer/src/modules/map/assets/circle.png
diff --git a/packages/mapviewer/src/modules/map/assets/cross.png b/packages/viewer/src/modules/map/assets/cross.png
similarity index 100%
rename from packages/mapviewer/src/modules/map/assets/cross.png
rename to packages/viewer/src/modules/map/assets/cross.png
diff --git a/packages/mapviewer/src/modules/map/assets/marker.png b/packages/viewer/src/modules/map/assets/marker.png
similarity index 100%
rename from packages/mapviewer/src/modules/map/assets/marker.png
rename to packages/viewer/src/modules/map/assets/marker.png
diff --git a/packages/mapviewer/src/modules/map/assets/north_arrow.png b/packages/viewer/src/modules/map/assets/north_arrow.png
similarity index 100%
rename from packages/mapviewer/src/modules/map/assets/north_arrow.png
rename to packages/viewer/src/modules/map/assets/north_arrow.png
diff --git a/packages/mapviewer/src/modules/map/assets/point.png b/packages/viewer/src/modules/map/assets/point.png
similarity index 100%
rename from packages/mapviewer/src/modules/map/assets/point.png
rename to packages/viewer/src/modules/map/assets/point.png
diff --git a/packages/mapviewer/src/modules/map/assets/void.png b/packages/viewer/src/modules/map/assets/void.png
similarity index 100%
rename from packages/mapviewer/src/modules/map/assets/void.png
rename to packages/viewer/src/modules/map/assets/void.png
diff --git a/packages/mapviewer/src/modules/map/components/CompareSlider.vue b/packages/viewer/src/modules/map/components/CompareSlider.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/CompareSlider.vue
rename to packages/viewer/src/modules/map/components/CompareSlider.vue
diff --git a/packages/mapviewer/src/modules/map/components/LocationPopup.vue b/packages/viewer/src/modules/map/components/LocationPopup.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/LocationPopup.vue
rename to packages/viewer/src/modules/map/components/LocationPopup.vue
diff --git a/packages/mapviewer/src/modules/map/components/LocationPopupPosition.vue b/packages/viewer/src/modules/map/components/LocationPopupPosition.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/LocationPopupPosition.vue
rename to packages/viewer/src/modules/map/components/LocationPopupPosition.vue
diff --git a/packages/mapviewer/src/modules/map/components/LocationPopupShare.vue b/packages/viewer/src/modules/map/components/LocationPopupShare.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/LocationPopupShare.vue
rename to packages/viewer/src/modules/map/components/LocationPopupShare.vue
diff --git a/packages/mapviewer/src/modules/map/components/MapPopover.vue b/packages/viewer/src/modules/map/components/MapPopover.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/MapPopover.vue
rename to packages/viewer/src/modules/map/components/MapPopover.vue
diff --git a/packages/mapviewer/src/modules/map/components/WarningRibbon.vue b/packages/viewer/src/modules/map/components/WarningRibbon.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/WarningRibbon.vue
rename to packages/viewer/src/modules/map/components/WarningRibbon.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumBackgroundLayer.vue b/packages/viewer/src/modules/map/components/cesium/CesiumBackgroundLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/CesiumBackgroundLayer.vue
rename to packages/viewer/src/modules/map/components/cesium/CesiumBackgroundLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumCamera.vue b/packages/viewer/src/modules/map/components/cesium/CesiumCamera.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/CesiumCamera.vue
rename to packages/viewer/src/modules/map/components/cesium/CesiumCamera.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumGPXLayer.vue b/packages/viewer/src/modules/map/components/cesium/CesiumGPXLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/CesiumGPXLayer.vue
rename to packages/viewer/src/modules/map/components/cesium/CesiumGPXLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumGeoJSONLayer.vue b/packages/viewer/src/modules/map/components/cesium/CesiumGeoJSONLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/CesiumGeoJSONLayer.vue
rename to packages/viewer/src/modules/map/components/cesium/CesiumGeoJSONLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumGeolocationFeedback.vue b/packages/viewer/src/modules/map/components/cesium/CesiumGeolocationFeedback.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/CesiumGeolocationFeedback.vue
rename to packages/viewer/src/modules/map/components/cesium/CesiumGeolocationFeedback.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumHighlightedFeatures.vue b/packages/viewer/src/modules/map/components/cesium/CesiumHighlightedFeatures.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/CesiumHighlightedFeatures.vue
rename to packages/viewer/src/modules/map/components/cesium/CesiumHighlightedFeatures.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumInteractions.vue b/packages/viewer/src/modules/map/components/cesium/CesiumInteractions.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/CesiumInteractions.vue
rename to packages/viewer/src/modules/map/components/cesium/CesiumInteractions.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumInternalLayer.vue b/packages/viewer/src/modules/map/components/cesium/CesiumInternalLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/CesiumInternalLayer.vue
rename to packages/viewer/src/modules/map/components/cesium/CesiumInternalLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumKMLLayer.vue b/packages/viewer/src/modules/map/components/cesium/CesiumKMLLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/CesiumKMLLayer.vue
rename to packages/viewer/src/modules/map/components/cesium/CesiumKMLLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumMap.vue b/packages/viewer/src/modules/map/components/cesium/CesiumMap.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/CesiumMap.vue
rename to packages/viewer/src/modules/map/components/cesium/CesiumMap.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumMouseTracker.vue b/packages/viewer/src/modules/map/components/cesium/CesiumMouseTracker.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/CesiumMouseTracker.vue
rename to packages/viewer/src/modules/map/components/cesium/CesiumMouseTracker.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumPopover.vue b/packages/viewer/src/modules/map/components/cesium/CesiumPopover.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/CesiumPopover.vue
rename to packages/viewer/src/modules/map/components/cesium/CesiumPopover.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumVectorLayer.vue b/packages/viewer/src/modules/map/components/cesium/CesiumVectorLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/CesiumVectorLayer.vue
rename to packages/viewer/src/modules/map/components/cesium/CesiumVectorLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumVisibleLayers.vue b/packages/viewer/src/modules/map/components/cesium/CesiumVisibleLayers.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/CesiumVisibleLayers.vue
rename to packages/viewer/src/modules/map/components/cesium/CesiumVisibleLayers.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumWMSLayer.vue b/packages/viewer/src/modules/map/components/cesium/CesiumWMSLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/CesiumWMSLayer.vue
rename to packages/viewer/src/modules/map/components/cesium/CesiumWMSLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/CesiumWMTSLayer.vue b/packages/viewer/src/modules/map/components/cesium/CesiumWMTSLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/CesiumWMTSLayer.vue
rename to packages/viewer/src/modules/map/components/cesium/CesiumWMTSLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/cesium/locales/de.json b/packages/viewer/src/modules/map/components/cesium/locales/de.json
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/locales/de.json
rename to packages/viewer/src/modules/map/components/cesium/locales/de.json
diff --git a/packages/mapviewer/src/modules/map/components/cesium/locales/en.json b/packages/viewer/src/modules/map/components/cesium/locales/en.json
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/locales/en.json
rename to packages/viewer/src/modules/map/components/cesium/locales/en.json
diff --git a/packages/mapviewer/src/modules/map/components/cesium/locales/fr.json b/packages/viewer/src/modules/map/components/cesium/locales/fr.json
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/locales/fr.json
rename to packages/viewer/src/modules/map/components/cesium/locales/fr.json
diff --git a/packages/mapviewer/src/modules/map/components/cesium/locales/it.json b/packages/viewer/src/modules/map/components/cesium/locales/it.json
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/locales/it.json
rename to packages/viewer/src/modules/map/components/cesium/locales/it.json
diff --git a/packages/mapviewer/src/modules/map/components/cesium/locales/rm.json b/packages/viewer/src/modules/map/components/cesium/locales/rm.json
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/locales/rm.json
rename to packages/viewer/src/modules/map/components/cesium/locales/rm.json
diff --git a/packages/mapviewer/src/modules/map/components/cesium/utils/addImageryLayer-mixins.js b/packages/viewer/src/modules/map/components/cesium/utils/addImageryLayer-mixins.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/utils/addImageryLayer-mixins.js
rename to packages/viewer/src/modules/map/components/cesium/utils/addImageryLayer-mixins.js
diff --git a/packages/mapviewer/src/modules/map/components/cesium/utils/addLayerToViewer-mixins.js b/packages/viewer/src/modules/map/components/cesium/utils/addLayerToViewer-mixins.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/utils/addLayerToViewer-mixins.js
rename to packages/viewer/src/modules/map/components/cesium/utils/addLayerToViewer-mixins.js
diff --git a/packages/mapviewer/src/modules/map/components/cesium/utils/cameraUtils.js b/packages/viewer/src/modules/map/components/cesium/utils/cameraUtils.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/utils/cameraUtils.js
rename to packages/viewer/src/modules/map/components/cesium/utils/cameraUtils.js
diff --git a/packages/mapviewer/src/modules/map/components/cesium/utils/highlightUtils.js b/packages/viewer/src/modules/map/components/cesium/utils/highlightUtils.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/utils/highlightUtils.js
rename to packages/viewer/src/modules/map/components/cesium/utils/highlightUtils.js
diff --git a/packages/mapviewer/src/modules/map/components/cesium/utils/styleConverter.js b/packages/viewer/src/modules/map/components/cesium/utils/styleConverter.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/utils/styleConverter.js
rename to packages/viewer/src/modules/map/components/cesium/utils/styleConverter.js
diff --git a/packages/mapviewer/src/modules/map/components/cesium/utils/swissnamesStyle.js b/packages/viewer/src/modules/map/components/cesium/utils/swissnamesStyle.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/utils/swissnamesStyle.js
rename to packages/viewer/src/modules/map/components/cesium/utils/swissnamesStyle.js
diff --git a/packages/mapviewer/src/modules/map/components/cesium/utils/useAddDataSourceLayer.composable.js b/packages/viewer/src/modules/map/components/cesium/utils/useAddDataSourceLayer.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/utils/useAddDataSourceLayer.composable.js
rename to packages/viewer/src/modules/map/components/cesium/utils/useAddDataSourceLayer.composable.js
diff --git a/packages/mapviewer/src/modules/map/components/cesium/utils/useAddImageryLayer.composable.js b/packages/viewer/src/modules/map/components/cesium/utils/useAddImageryLayer.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/utils/useAddImageryLayer.composable.js
rename to packages/viewer/src/modules/map/components/cesium/utils/useAddImageryLayer.composable.js
diff --git a/packages/mapviewer/src/modules/map/components/cesium/utils/useAddPrimitiveLayer.composable.js b/packages/viewer/src/modules/map/components/cesium/utils/useAddPrimitiveLayer.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/cesium/utils/useAddPrimitiveLayer.composable.js
rename to packages/viewer/src/modules/map/components/cesium/utils/useAddPrimitiveLayer.composable.js
diff --git a/packages/mapviewer/src/modules/map/components/common/mouseTrackerUtils.js b/packages/viewer/src/modules/map/components/common/mouseTrackerUtils.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/common/mouseTrackerUtils.js
rename to packages/viewer/src/modules/map/components/common/mouseTrackerUtils.js
diff --git a/packages/mapviewer/src/modules/map/components/common/useDragFileOverlay.composable.js b/packages/viewer/src/modules/map/components/common/useDragFileOverlay.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/common/useDragFileOverlay.composable.js
rename to packages/viewer/src/modules/map/components/common/useDragFileOverlay.composable.js
diff --git a/packages/mapviewer/src/modules/map/components/common/z-index.composable.js b/packages/viewer/src/modules/map/components/common/z-index.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/common/z-index.composable.js
rename to packages/viewer/src/modules/map/components/common/z-index.composable.js
diff --git a/packages/mapviewer/src/modules/map/components/footer/MapFooter.vue b/packages/viewer/src/modules/map/components/footer/MapFooter.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/footer/MapFooter.vue
rename to packages/viewer/src/modules/map/components/footer/MapFooter.vue
diff --git a/packages/mapviewer/src/modules/map/components/footer/MapFooterAppCopyright.vue b/packages/viewer/src/modules/map/components/footer/MapFooterAppCopyright.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/footer/MapFooterAppCopyright.vue
rename to packages/viewer/src/modules/map/components/footer/MapFooterAppCopyright.vue
diff --git a/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionItem.vue b/packages/viewer/src/modules/map/components/footer/MapFooterAttributionItem.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionItem.vue
rename to packages/viewer/src/modules/map/components/footer/MapFooterAttributionItem.vue
diff --git a/packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue b/packages/viewer/src/modules/map/components/footer/MapFooterAttributionList.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/footer/MapFooterAttributionList.vue
rename to packages/viewer/src/modules/map/components/footer/MapFooterAttributionList.vue
diff --git a/packages/mapviewer/src/modules/map/components/footer/backgroundSelector/BackgroundSelector.vue b/packages/viewer/src/modules/map/components/footer/backgroundSelector/BackgroundSelector.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/footer/backgroundSelector/BackgroundSelector.vue
rename to packages/viewer/src/modules/map/components/footer/backgroundSelector/BackgroundSelector.vue
diff --git a/packages/mapviewer/src/modules/map/components/footer/backgroundSelector/BackgroundSelectorSquared.vue b/packages/viewer/src/modules/map/components/footer/backgroundSelector/BackgroundSelectorSquared.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/footer/backgroundSelector/BackgroundSelectorSquared.vue
rename to packages/viewer/src/modules/map/components/footer/backgroundSelector/BackgroundSelectorSquared.vue
diff --git a/packages/mapviewer/src/modules/map/components/footer/backgroundSelector/BackgroundSelectorWheelRounded.vue b/packages/viewer/src/modules/map/components/footer/backgroundSelector/BackgroundSelectorWheelRounded.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/footer/backgroundSelector/BackgroundSelectorWheelRounded.vue
rename to packages/viewer/src/modules/map/components/footer/backgroundSelector/BackgroundSelectorWheelRounded.vue
diff --git a/packages/mapviewer/src/modules/map/components/footer/backgroundSelector/bg-selector.scss b/packages/viewer/src/modules/map/components/footer/backgroundSelector/bg-selector.scss
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/footer/backgroundSelector/bg-selector.scss
rename to packages/viewer/src/modules/map/components/footer/backgroundSelector/bg-selector.scss
diff --git a/packages/mapviewer/src/modules/map/components/footer/backgroundSelector/useBackgroundSelector.js b/packages/viewer/src/modules/map/components/footer/backgroundSelector/useBackgroundSelector.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/footer/backgroundSelector/useBackgroundSelector.js
rename to packages/viewer/src/modules/map/components/footer/backgroundSelector/useBackgroundSelector.js
diff --git a/packages/mapviewer/src/modules/map/components/footer/backgroundSelector/useBackgroundSelectorProps.js b/packages/viewer/src/modules/map/components/footer/backgroundSelector/useBackgroundSelectorProps.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/footer/backgroundSelector/useBackgroundSelectorProps.js
rename to packages/viewer/src/modules/map/components/footer/backgroundSelector/useBackgroundSelectorProps.js
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersAccuracyCircle.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersAccuracyCircle.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersAccuracyCircle.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersAccuracyCircle.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersBackgroundLayer.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersBackgroundLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersBackgroundLayer.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersBackgroundLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersCOGTiffLayer.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersCOGTiffLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersCOGTiffLayer.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersCOGTiffLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersCompassButton.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersCompassButton.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersCompassButton.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersCompassButton.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersCrossHair.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersCrossHair.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersCrossHair.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersCrossHair.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersExternalWMTSLayer.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersExternalWMTSLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersExternalWMTSLayer.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersExternalWMTSLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersGPXLayer.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersGPXLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersGPXLayer.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersGPXLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersGeoJSONLayer.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersGeoJSONLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersGeoJSONLayer.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersGeoJSONLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersGeolocationFeedback.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersGeolocationFeedback.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersGeolocationFeedback.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersGeolocationFeedback.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersHighlightedFeatures.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersHighlightedFeatures.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersHighlightedFeatures.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersHighlightedFeatures.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersInternalLayer.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersInternalLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersInternalLayer.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersInternalLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersKMLLayer.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersKMLLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersKMLLayer.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersKMLLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersMap.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersMap.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersMap.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersMap.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersMarker.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersMarker.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersMarker.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersMarker.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersMouseTracker.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersMouseTracker.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersMouseTracker.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersMouseTracker.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersPinnedLocation.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersPinnedLocation.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersPinnedLocation.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersPinnedLocation.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersPopover.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersPopover.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersPopover.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersPopover.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersPrintResolutionEnforcer.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersPrintResolutionEnforcer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersPrintResolutionEnforcer.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersPrintResolutionEnforcer.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersRectangleSelectionFeedback.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersRectangleSelectionFeedback.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersRectangleSelectionFeedback.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersRectangleSelectionFeedback.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersScale.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersScale.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersScale.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersScale.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersSelectionRectangle.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersSelectionRectangle.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersSelectionRectangle.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersSelectionRectangle.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersVectorLayer.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersVectorLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersVectorLayer.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersVectorLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersVisibleLayers.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersVisibleLayers.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersVisibleLayers.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersVisibleLayers.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersVisionCone.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersVisionCone.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersVisionCone.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersVisionCone.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersWMSLayer.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersWMSLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersWMSLayer.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersWMSLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/OpenLayersWMTSLayer.vue b/packages/viewer/src/modules/map/components/openlayers/OpenLayersWMTSLayer.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/OpenLayersWMTSLayer.vue
rename to packages/viewer/src/modules/map/components/openlayers/OpenLayersWMTSLayer.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/debug/OpenLayersDeviceOrientationDebugInfo.vue b/packages/viewer/src/modules/map/components/openlayers/debug/OpenLayersDeviceOrientationDebugInfo.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/debug/OpenLayersDeviceOrientationDebugInfo.vue
rename to packages/viewer/src/modules/map/components/openlayers/debug/OpenLayersDeviceOrientationDebugInfo.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/debug/OpenLayersLayerExtents.vue b/packages/viewer/src/modules/map/components/openlayers/debug/OpenLayersLayerExtents.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/debug/OpenLayersLayerExtents.vue
rename to packages/viewer/src/modules/map/components/openlayers/debug/OpenLayersLayerExtents.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/debug/OpenLayersTileDebugInfo.vue b/packages/viewer/src/modules/map/components/openlayers/debug/OpenLayersTileDebugInfo.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/debug/OpenLayersTileDebugInfo.vue
rename to packages/viewer/src/modules/map/components/openlayers/debug/OpenLayersTileDebugInfo.vue
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/utils/markerStyle.js b/packages/viewer/src/modules/map/components/openlayers/utils/markerStyle.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/utils/markerStyle.js
rename to packages/viewer/src/modules/map/components/openlayers/utils/markerStyle.js
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/utils/styleFromLiterals.js b/packages/viewer/src/modules/map/components/openlayers/utils/styleFromLiterals.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/utils/styleFromLiterals.js
rename to packages/viewer/src/modules/map/components/openlayers/utils/styleFromLiterals.js
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/utils/useAddLayerToMap.composable.js b/packages/viewer/src/modules/map/components/openlayers/utils/useAddLayerToMap.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/utils/useAddLayerToMap.composable.js
rename to packages/viewer/src/modules/map/components/openlayers/utils/useAddLayerToMap.composable.js
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/utils/useDeviceOrientation.composable.js b/packages/viewer/src/modules/map/components/openlayers/utils/useDeviceOrientation.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/utils/useDeviceOrientation.composable.js
rename to packages/viewer/src/modules/map/components/openlayers/utils/useDeviceOrientation.composable.js
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/utils/useDragBoxSelect.composable.js b/packages/viewer/src/modules/map/components/openlayers/utils/useDragBoxSelect.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/utils/useDragBoxSelect.composable.js
rename to packages/viewer/src/modules/map/components/openlayers/utils/useDragBoxSelect.composable.js
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js b/packages/viewer/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js
rename to packages/viewer/src/modules/map/components/openlayers/utils/useMapInteractions.composable.js
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/utils/usePrint.composable.js b/packages/viewer/src/modules/map/components/openlayers/utils/usePrint.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/utils/usePrint.composable.js
rename to packages/viewer/src/modules/map/components/openlayers/utils/usePrint.composable.js
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/utils/usePrintAreaRenderer.composable.js b/packages/viewer/src/modules/map/components/openlayers/utils/usePrintAreaRenderer.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/utils/usePrintAreaRenderer.composable.js
rename to packages/viewer/src/modules/map/components/openlayers/utils/usePrintAreaRenderer.composable.js
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/utils/useVectorLayer.composable.js b/packages/viewer/src/modules/map/components/openlayers/utils/useVectorLayer.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/utils/useVectorLayer.composable.js
rename to packages/viewer/src/modules/map/components/openlayers/utils/useVectorLayer.composable.js
diff --git a/packages/mapviewer/src/modules/map/components/openlayers/utils/useViewBasedOnProjection.composable.js b/packages/viewer/src/modules/map/components/openlayers/utils/useViewBasedOnProjection.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/openlayers/utils/useViewBasedOnProjection.composable.js
rename to packages/viewer/src/modules/map/components/openlayers/utils/useViewBasedOnProjection.composable.js
diff --git a/packages/mapviewer/src/modules/map/components/toolbox/FullScreenButton.vue b/packages/viewer/src/modules/map/components/toolbox/FullScreenButton.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/toolbox/FullScreenButton.vue
rename to packages/viewer/src/modules/map/components/toolbox/FullScreenButton.vue
diff --git a/packages/mapviewer/src/modules/map/components/toolbox/GeolocButton.vue b/packages/viewer/src/modules/map/components/toolbox/GeolocButton.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/toolbox/GeolocButton.vue
rename to packages/viewer/src/modules/map/components/toolbox/GeolocButton.vue
diff --git a/packages/mapviewer/src/modules/map/components/toolbox/MapToolbox.vue b/packages/viewer/src/modules/map/components/toolbox/MapToolbox.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/toolbox/MapToolbox.vue
rename to packages/viewer/src/modules/map/components/toolbox/MapToolbox.vue
diff --git a/packages/mapviewer/src/modules/map/components/toolbox/TimeSlider.vue b/packages/viewer/src/modules/map/components/toolbox/TimeSlider.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/toolbox/TimeSlider.vue
rename to packages/viewer/src/modules/map/components/toolbox/TimeSlider.vue
diff --git a/packages/mapviewer/src/modules/map/components/toolbox/TimeSliderButton.vue b/packages/viewer/src/modules/map/components/toolbox/TimeSliderButton.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/toolbox/TimeSliderButton.vue
rename to packages/viewer/src/modules/map/components/toolbox/TimeSliderButton.vue
diff --git a/packages/mapviewer/src/modules/map/components/toolbox/TimeSliderDropdown.vue b/packages/viewer/src/modules/map/components/toolbox/TimeSliderDropdown.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/toolbox/TimeSliderDropdown.vue
rename to packages/viewer/src/modules/map/components/toolbox/TimeSliderDropdown.vue
diff --git a/packages/mapviewer/src/modules/map/components/toolbox/TimeSliderDropdownSearchList.vue b/packages/viewer/src/modules/map/components/toolbox/TimeSliderDropdownSearchList.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/toolbox/TimeSliderDropdownSearchList.vue
rename to packages/viewer/src/modules/map/components/toolbox/TimeSliderDropdownSearchList.vue
diff --git a/packages/mapviewer/src/modules/map/components/toolbox/Toggle3dButton.vue b/packages/viewer/src/modules/map/components/toolbox/Toggle3dButton.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/toolbox/Toggle3dButton.vue
rename to packages/viewer/src/modules/map/components/toolbox/Toggle3dButton.vue
diff --git a/packages/mapviewer/src/modules/map/components/toolbox/ZoomButtons.vue b/packages/viewer/src/modules/map/components/toolbox/ZoomButtons.vue
similarity index 100%
rename from packages/mapviewer/src/modules/map/components/toolbox/ZoomButtons.vue
rename to packages/viewer/src/modules/map/components/toolbox/ZoomButtons.vue
diff --git a/packages/mapviewer/src/modules/map/index.js b/packages/viewer/src/modules/map/index.js
similarity index 100%
rename from packages/mapviewer/src/modules/map/index.js
rename to packages/viewer/src/modules/map/index.js
diff --git a/packages/mapviewer/src/modules/map/scss/toolbox-buttons.scss b/packages/viewer/src/modules/map/scss/toolbox-buttons.scss
similarity index 100%
rename from packages/mapviewer/src/modules/map/scss/toolbox-buttons.scss
rename to packages/viewer/src/modules/map/scss/toolbox-buttons.scss
diff --git a/packages/mapviewer/src/modules/menu/MenuModule.vue b/packages/viewer/src/modules/menu/MenuModule.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/MenuModule.vue
rename to packages/viewer/src/modules/menu/MenuModule.vue
diff --git a/packages/mapviewer/src/modules/menu/README.md b/packages/viewer/src/modules/menu/README.md
similarity index 100%
rename from packages/mapviewer/src/modules/menu/README.md
rename to packages/viewer/src/modules/menu/README.md
diff --git a/packages/mapviewer/src/modules/menu/assets/text-dev.png b/packages/viewer/src/modules/menu/assets/text-dev.png
similarity index 100%
rename from packages/mapviewer/src/modules/menu/assets/text-dev.png
rename to packages/viewer/src/modules/menu/assets/text-dev.png
diff --git a/packages/mapviewer/src/modules/menu/assets/text.png b/packages/viewer/src/modules/menu/assets/text.png
similarity index 100%
rename from packages/mapviewer/src/modules/menu/assets/text.png
rename to packages/viewer/src/modules/menu/assets/text.png
diff --git a/packages/mapviewer/src/modules/menu/assets/topics.png b/packages/viewer/src/modules/menu/assets/topics.png
similarity index 100%
rename from packages/mapviewer/src/modules/menu/assets/topics.png
rename to packages/viewer/src/modules/menu/assets/topics.png
diff --git a/packages/mapviewer/src/modules/menu/components/3d/MenuThreeD.vue b/packages/viewer/src/modules/menu/components/3d/MenuThreeD.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/3d/MenuThreeD.vue
rename to packages/viewer/src/modules/menu/components/3d/MenuThreeD.vue
diff --git a/packages/mapviewer/src/modules/menu/components/LayerCatalogue.vue b/packages/viewer/src/modules/menu/components/LayerCatalogue.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/LayerCatalogue.vue
rename to packages/viewer/src/modules/menu/components/LayerCatalogue.vue
diff --git a/packages/mapviewer/src/modules/menu/components/LayerCatalogueItem.vue b/packages/viewer/src/modules/menu/components/LayerCatalogueItem.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/LayerCatalogueItem.vue
rename to packages/viewer/src/modules/menu/components/LayerCatalogueItem.vue
diff --git a/packages/mapviewer/src/modules/menu/components/LayerDescriptionPopup.vue b/packages/viewer/src/modules/menu/components/LayerDescriptionPopup.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/LayerDescriptionPopup.vue
rename to packages/viewer/src/modules/menu/components/LayerDescriptionPopup.vue
diff --git a/packages/mapviewer/src/modules/menu/components/activeLayers/MenuActiveLayersList.vue b/packages/viewer/src/modules/menu/components/activeLayers/MenuActiveLayersList.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/activeLayers/MenuActiveLayersList.vue
rename to packages/viewer/src/modules/menu/components/activeLayers/MenuActiveLayersList.vue
diff --git a/packages/mapviewer/src/modules/menu/components/activeLayers/MenuActiveLayersListItem.vue b/packages/viewer/src/modules/menu/components/activeLayers/MenuActiveLayersListItem.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/activeLayers/MenuActiveLayersListItem.vue
rename to packages/viewer/src/modules/menu/components/activeLayers/MenuActiveLayersListItem.vue
diff --git a/packages/mapviewer/src/modules/menu/components/activeLayers/MenuActiveLayersListItemTimeSelector.vue b/packages/viewer/src/modules/menu/components/activeLayers/MenuActiveLayersListItemTimeSelector.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/activeLayers/MenuActiveLayersListItemTimeSelector.vue
rename to packages/viewer/src/modules/menu/components/activeLayers/MenuActiveLayersListItemTimeSelector.vue
diff --git a/packages/mapviewer/src/modules/menu/components/activeLayers/TransparencySlider.vue b/packages/viewer/src/modules/menu/components/activeLayers/TransparencySlider.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/activeLayers/TransparencySlider.vue
rename to packages/viewer/src/modules/menu/components/activeLayers/TransparencySlider.vue
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/ImportCatalogue.vue b/packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/ImportCatalogue.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/ImportCatalogue.vue
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/ImportCatalogue.vue
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/ProviderList.vue b/packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/ProviderList.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/ProviderList.vue
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/ProviderList.vue
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/ProviderUrl.vue b/packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/ProviderUrl.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/ProviderUrl.vue
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/ProviderUrl.vue
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/external-providers.json b/packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/external-providers.json
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/external-providers.json
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/external-providers.json
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/useCapabilities.js b/packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/useCapabilities.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/useCapabilities.js
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/useCapabilities.js
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/useProviders.js b/packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/useProviders.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/useProviders.js
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/useProviders.js
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/utils.js b/packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/utils.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportCatalogue/utils.js
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportCatalogue/utils.js
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/ImportFile.vue b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/ImportFile.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/ImportFile.vue
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/ImportFile.vue
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileButtons.vue b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileButtons.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileButtons.vue
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileButtons.vue
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileLocalTab.vue b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileLocalTab.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileLocalTab.vue
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileLocalTab.vue
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileOnlineTab.vue b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileOnlineTab.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileOnlineTab.vue
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/ImportFileOnlineTab.vue
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/CloudOptimizedGeoTIFFParser.class.js b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/CloudOptimizedGeoTIFFParser.class.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/CloudOptimizedGeoTIFFParser.class.js
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/CloudOptimizedGeoTIFFParser.class.js
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/FileParser.class.js b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/FileParser.class.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/FileParser.class.js
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/FileParser.class.js
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/GPXParser.class.js b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/GPXParser.class.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/GPXParser.class.js
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/GPXParser.class.js
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/KMLParser.class.js b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/KMLParser.class.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/KMLParser.class.js
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/KMLParser.class.js
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/KMZParser.class.js b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/KMZParser.class.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/KMZParser.class.js
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/KMZParser.class.js
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/__tests__/KMLParser.class.spec.js b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/__tests__/KMLParser.class.spec.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/__tests__/KMLParser.class.spec.js
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/__tests__/KMLParser.class.spec.js
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/EmptyFileContentError.error.js b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/EmptyFileContentError.error.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/EmptyFileContentError.error.js
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/EmptyFileContentError.error.js
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/InvalidFileContentError.error.js b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/InvalidFileContentError.error.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/InvalidFileContentError.error.js
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/InvalidFileContentError.error.js
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/OutOfBoundsError.error.js b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/OutOfBoundsError.error.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/OutOfBoundsError.error.js
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/OutOfBoundsError.error.js
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/UnknownProjectionError.error.js b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/UnknownProjectionError.error.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/UnknownProjectionError.error.js
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/UnknownProjectionError.error.js
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/generateErrorMessageFromErrorType.utils.js b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/generateErrorMessageFromErrorType.utils.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/generateErrorMessageFromErrorType.utils.js
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/errors/generateErrorMessageFromErrorType.utils.js
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/index.js b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/index.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/parser/index.js
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/parser/index.js
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/useImportFile.composable.js b/packages/viewer/src/modules/menu/components/advancedTools/ImportFile/useImportFile.composable.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/ImportFile/useImportFile.composable.js
rename to packages/viewer/src/modules/menu/components/advancedTools/ImportFile/useImportFile.composable.js
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/MenuAdvancedToolsList.vue b/packages/viewer/src/modules/menu/components/advancedTools/MenuAdvancedToolsList.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/MenuAdvancedToolsList.vue
rename to packages/viewer/src/modules/menu/components/advancedTools/MenuAdvancedToolsList.vue
diff --git a/packages/mapviewer/src/modules/menu/components/advancedTools/MenuAdvancedToolsListItem.vue b/packages/viewer/src/modules/menu/components/advancedTools/MenuAdvancedToolsListItem.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/advancedTools/MenuAdvancedToolsListItem.vue
rename to packages/viewer/src/modules/menu/components/advancedTools/MenuAdvancedToolsListItem.vue
diff --git a/packages/mapviewer/src/modules/menu/components/common/MenuItemCheckBox.vue b/packages/viewer/src/modules/menu/components/common/MenuItemCheckBox.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/common/MenuItemCheckBox.vue
rename to packages/viewer/src/modules/menu/components/common/MenuItemCheckBox.vue
diff --git a/packages/mapviewer/src/modules/menu/components/debug/BaseUrlOverrideModal.vue b/packages/viewer/src/modules/menu/components/debug/BaseUrlOverrideModal.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/debug/BaseUrlOverrideModal.vue
rename to packages/viewer/src/modules/menu/components/debug/BaseUrlOverrideModal.vue
diff --git a/packages/mapviewer/src/modules/menu/components/debug/DebugLayerFinder.vue b/packages/viewer/src/modules/menu/components/debug/DebugLayerFinder.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/debug/DebugLayerFinder.vue
rename to packages/viewer/src/modules/menu/components/debug/DebugLayerFinder.vue
diff --git a/packages/mapviewer/src/modules/menu/components/debug/DebugLayerFinderFilter.vue b/packages/viewer/src/modules/menu/components/debug/DebugLayerFinderFilter.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/debug/DebugLayerFinderFilter.vue
rename to packages/viewer/src/modules/menu/components/debug/DebugLayerFinderFilter.vue
diff --git a/packages/mapviewer/src/modules/menu/components/debug/DebugPrint.vue b/packages/viewer/src/modules/menu/components/debug/DebugPrint.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/debug/DebugPrint.vue
rename to packages/viewer/src/modules/menu/components/debug/DebugPrint.vue
diff --git a/packages/mapviewer/src/modules/menu/components/debug/DebugToolbar.vue b/packages/viewer/src/modules/menu/components/debug/DebugToolbar.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/debug/DebugToolbar.vue
rename to packages/viewer/src/modules/menu/components/debug/DebugToolbar.vue
diff --git a/packages/mapviewer/src/modules/menu/components/debug/DebugViewSelector.vue b/packages/viewer/src/modules/menu/components/debug/DebugViewSelector.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/debug/DebugViewSelector.vue
rename to packages/viewer/src/modules/menu/components/debug/DebugViewSelector.vue
diff --git a/packages/mapviewer/src/modules/menu/components/header/AdditionalInfoCollapsable.vue b/packages/viewer/src/modules/menu/components/header/AdditionalInfoCollapsable.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/header/AdditionalInfoCollapsable.vue
rename to packages/viewer/src/modules/menu/components/header/AdditionalInfoCollapsable.vue
diff --git a/packages/mapviewer/src/modules/menu/components/header/ConfederationFullLogo.vue b/packages/viewer/src/modules/menu/components/header/ConfederationFullLogo.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/header/ConfederationFullLogo.vue
rename to packages/viewer/src/modules/menu/components/header/ConfederationFullLogo.vue
diff --git a/packages/mapviewer/src/modules/menu/components/header/HeaderLangSelector.vue b/packages/viewer/src/modules/menu/components/header/HeaderLangSelector.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/header/HeaderLangSelector.vue
rename to packages/viewer/src/modules/menu/components/header/HeaderLangSelector.vue
diff --git a/packages/mapviewer/src/modules/menu/components/header/HeaderLink.vue b/packages/viewer/src/modules/menu/components/header/HeaderLink.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/header/HeaderLink.vue
rename to packages/viewer/src/modules/menu/components/header/HeaderLink.vue
diff --git a/packages/mapviewer/src/modules/menu/components/header/HeaderMenuButton.vue b/packages/viewer/src/modules/menu/components/header/HeaderMenuButton.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/header/HeaderMenuButton.vue
rename to packages/viewer/src/modules/menu/components/header/HeaderMenuButton.vue
diff --git a/packages/mapviewer/src/modules/menu/components/header/HeaderWithSearch.vue b/packages/viewer/src/modules/menu/components/header/HeaderWithSearch.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/header/HeaderWithSearch.vue
rename to packages/viewer/src/modules/menu/components/header/HeaderWithSearch.vue
diff --git a/packages/mapviewer/src/modules/menu/components/header/SwissFlag.vue b/packages/viewer/src/modules/menu/components/header/SwissFlag.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/header/SwissFlag.vue
rename to packages/viewer/src/modules/menu/components/header/SwissFlag.vue
diff --git a/packages/mapviewer/src/modules/menu/components/help/HelpLink.vue b/packages/viewer/src/modules/menu/components/help/HelpLink.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/help/HelpLink.vue
rename to packages/viewer/src/modules/menu/components/help/HelpLink.vue
diff --git a/packages/mapviewer/src/modules/menu/components/help/MenuHelpSection.vue b/packages/viewer/src/modules/menu/components/help/MenuHelpSection.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/help/MenuHelpSection.vue
rename to packages/viewer/src/modules/menu/components/help/MenuHelpSection.vue
diff --git a/packages/mapviewer/src/modules/menu/components/help/MoreInfo.vue b/packages/viewer/src/modules/menu/components/help/MoreInfo.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/help/MoreInfo.vue
rename to packages/viewer/src/modules/menu/components/help/MoreInfo.vue
diff --git a/packages/mapviewer/src/modules/menu/components/help/ReportProblemButton.vue b/packages/viewer/src/modules/menu/components/help/ReportProblemButton.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/help/ReportProblemButton.vue
rename to packages/viewer/src/modules/menu/components/help/ReportProblemButton.vue
diff --git a/packages/mapviewer/src/modules/menu/components/help/UpdateInfo.vue b/packages/viewer/src/modules/menu/components/help/UpdateInfo.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/help/UpdateInfo.vue
rename to packages/viewer/src/modules/menu/components/help/UpdateInfo.vue
diff --git a/packages/mapviewer/src/modules/menu/components/help/common/SendActionButtons.vue b/packages/viewer/src/modules/menu/components/help/common/SendActionButtons.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/help/common/SendActionButtons.vue
rename to packages/viewer/src/modules/menu/components/help/common/SendActionButtons.vue
diff --git a/packages/mapviewer/src/modules/menu/components/help/feedback/FeedbackButton.vue b/packages/viewer/src/modules/menu/components/help/feedback/FeedbackButton.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/help/feedback/FeedbackButton.vue
rename to packages/viewer/src/modules/menu/components/help/feedback/FeedbackButton.vue
diff --git a/packages/mapviewer/src/modules/menu/components/help/feedback/FeedbackRating.vue b/packages/viewer/src/modules/menu/components/help/feedback/FeedbackRating.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/help/feedback/FeedbackRating.vue
rename to packages/viewer/src/modules/menu/components/help/feedback/FeedbackRating.vue
diff --git a/packages/mapviewer/src/modules/menu/components/menu/MenuSection.vue b/packages/viewer/src/modules/menu/components/menu/MenuSection.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/menu/MenuSection.vue
rename to packages/viewer/src/modules/menu/components/menu/MenuSection.vue
diff --git a/packages/mapviewer/src/modules/menu/components/menu/MenuTray.vue b/packages/viewer/src/modules/menu/components/menu/MenuTray.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/menu/MenuTray.vue
rename to packages/viewer/src/modules/menu/components/menu/MenuTray.vue
diff --git a/packages/mapviewer/src/modules/menu/components/print/MenuPrintSection.vue b/packages/viewer/src/modules/menu/components/print/MenuPrintSection.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/print/MenuPrintSection.vue
rename to packages/viewer/src/modules/menu/components/print/MenuPrintSection.vue
diff --git a/packages/mapviewer/src/modules/menu/components/search/SearchBar.vue b/packages/viewer/src/modules/menu/components/search/SearchBar.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/search/SearchBar.vue
rename to packages/viewer/src/modules/menu/components/search/SearchBar.vue
diff --git a/packages/mapviewer/src/modules/menu/components/search/SearchResultCategory.vue b/packages/viewer/src/modules/menu/components/search/SearchResultCategory.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/search/SearchResultCategory.vue
rename to packages/viewer/src/modules/menu/components/search/SearchResultCategory.vue
diff --git a/packages/mapviewer/src/modules/menu/components/search/SearchResultList.vue b/packages/viewer/src/modules/menu/components/search/SearchResultList.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/search/SearchResultList.vue
rename to packages/viewer/src/modules/menu/components/search/SearchResultList.vue
diff --git a/packages/mapviewer/src/modules/menu/components/search/SearchResultListEntry.vue b/packages/viewer/src/modules/menu/components/search/SearchResultListEntry.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/search/SearchResultListEntry.vue
rename to packages/viewer/src/modules/menu/components/search/SearchResultListEntry.vue
diff --git a/packages/mapviewer/src/modules/menu/components/share/MenuShareEmbed.vue b/packages/viewer/src/modules/menu/components/share/MenuShareEmbed.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/share/MenuShareEmbed.vue
rename to packages/viewer/src/modules/menu/components/share/MenuShareEmbed.vue
diff --git a/packages/mapviewer/src/modules/menu/components/share/MenuShareInputCopyButton.vue b/packages/viewer/src/modules/menu/components/share/MenuShareInputCopyButton.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/share/MenuShareInputCopyButton.vue
rename to packages/viewer/src/modules/menu/components/share/MenuShareInputCopyButton.vue
diff --git a/packages/mapviewer/src/modules/menu/components/share/MenuShareSection.vue b/packages/viewer/src/modules/menu/components/share/MenuShareSection.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/share/MenuShareSection.vue
rename to packages/viewer/src/modules/menu/components/share/MenuShareSection.vue
diff --git a/packages/mapviewer/src/modules/menu/components/share/MenuShareSocialNetworks.vue b/packages/viewer/src/modules/menu/components/share/MenuShareSocialNetworks.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/share/MenuShareSocialNetworks.vue
rename to packages/viewer/src/modules/menu/components/share/MenuShareSocialNetworks.vue
diff --git a/packages/mapviewer/src/modules/menu/components/topics/MenuTopicSection.vue b/packages/viewer/src/modules/menu/components/topics/MenuTopicSection.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/topics/MenuTopicSection.vue
rename to packages/viewer/src/modules/menu/components/topics/MenuTopicSection.vue
diff --git a/packages/mapviewer/src/modules/menu/components/topics/MenuTopicSelectionPopup.vue b/packages/viewer/src/modules/menu/components/topics/MenuTopicSelectionPopup.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/topics/MenuTopicSelectionPopup.vue
rename to packages/viewer/src/modules/menu/components/topics/MenuTopicSelectionPopup.vue
diff --git a/packages/mapviewer/src/modules/menu/components/topics/TopicIcon.vue b/packages/viewer/src/modules/menu/components/topics/TopicIcon.vue
similarity index 100%
rename from packages/mapviewer/src/modules/menu/components/topics/TopicIcon.vue
rename to packages/viewer/src/modules/menu/components/topics/TopicIcon.vue
diff --git a/packages/mapviewer/src/modules/menu/index.js b/packages/viewer/src/modules/menu/index.js
similarity index 100%
rename from packages/mapviewer/src/modules/menu/index.js
rename to packages/viewer/src/modules/menu/index.js
diff --git a/packages/mapviewer/src/modules/menu/scss/menu-items.scss b/packages/viewer/src/modules/menu/scss/menu-items.scss
similarity index 100%
rename from packages/mapviewer/src/modules/menu/scss/menu-items.scss
rename to packages/viewer/src/modules/menu/scss/menu-items.scss
diff --git a/packages/mapviewer/src/modules/menu/scss/topics-image.scss b/packages/viewer/src/modules/menu/scss/topics-image.scss
similarity index 100%
rename from packages/mapviewer/src/modules/menu/scss/topics-image.scss
rename to packages/viewer/src/modules/menu/scss/topics-image.scss
diff --git a/packages/mapviewer/src/router/__tests__/legacyPermalinkManagement.routerPlugin.spec.js b/packages/viewer/src/router/__tests__/legacyPermalinkManagement.routerPlugin.spec.js
similarity index 100%
rename from packages/mapviewer/src/router/__tests__/legacyPermalinkManagement.routerPlugin.spec.js
rename to packages/viewer/src/router/__tests__/legacyPermalinkManagement.routerPlugin.spec.js
diff --git a/packages/mapviewer/src/router/appLoadingManagement.routerPlugin.js b/packages/viewer/src/router/appLoadingManagement.routerPlugin.js
similarity index 100%
rename from packages/mapviewer/src/router/appLoadingManagement.routerPlugin.js
rename to packages/viewer/src/router/appLoadingManagement.routerPlugin.js
diff --git a/packages/mapviewer/src/router/index.js b/packages/viewer/src/router/index.js
similarity index 100%
rename from packages/mapviewer/src/router/index.js
rename to packages/viewer/src/router/index.js
diff --git a/packages/mapviewer/src/router/legacyPermalinkManagement.routerPlugin.js b/packages/viewer/src/router/legacyPermalinkManagement.routerPlugin.js
similarity index 100%
rename from packages/mapviewer/src/router/legacyPermalinkManagement.routerPlugin.js
rename to packages/viewer/src/router/legacyPermalinkManagement.routerPlugin.js
diff --git a/packages/mapviewer/src/router/storeSync/BaseUrlOverrideParamConfig.class.js b/packages/viewer/src/router/storeSync/BaseUrlOverrideParamConfig.class.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/BaseUrlOverrideParamConfig.class.js
rename to packages/viewer/src/router/storeSync/BaseUrlOverrideParamConfig.class.js
diff --git a/packages/mapviewer/src/router/storeSync/CameraParamConfig.class.js b/packages/viewer/src/router/storeSync/CameraParamConfig.class.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/CameraParamConfig.class.js
rename to packages/viewer/src/router/storeSync/CameraParamConfig.class.js
diff --git a/packages/mapviewer/src/router/storeSync/CompareSliderParamConfig.class.js b/packages/viewer/src/router/storeSync/CompareSliderParamConfig.class.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/CompareSliderParamConfig.class.js
rename to packages/viewer/src/router/storeSync/CompareSliderParamConfig.class.js
diff --git a/packages/mapviewer/src/router/storeSync/CrossHairParamConfig.class.js b/packages/viewer/src/router/storeSync/CrossHairParamConfig.class.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/CrossHairParamConfig.class.js
rename to packages/viewer/src/router/storeSync/CrossHairParamConfig.class.js
diff --git a/packages/mapviewer/src/router/storeSync/LayerParamConfig.class.js b/packages/viewer/src/router/storeSync/LayerParamConfig.class.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/LayerParamConfig.class.js
rename to packages/viewer/src/router/storeSync/LayerParamConfig.class.js
diff --git a/packages/mapviewer/src/router/storeSync/NoSimpleZoomParamConfig.class.js b/packages/viewer/src/router/storeSync/NoSimpleZoomParamConfig.class.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/NoSimpleZoomParamConfig.class.js
rename to packages/viewer/src/router/storeSync/NoSimpleZoomParamConfig.class.js
diff --git a/packages/mapviewer/src/router/storeSync/PositionParamConfig.class.js b/packages/viewer/src/router/storeSync/PositionParamConfig.class.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/PositionParamConfig.class.js
rename to packages/viewer/src/router/storeSync/PositionParamConfig.class.js
diff --git a/packages/mapviewer/src/router/storeSync/PrintConfig.class.js b/packages/viewer/src/router/storeSync/PrintConfig.class.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/PrintConfig.class.js
rename to packages/viewer/src/router/storeSync/PrintConfig.class.js
diff --git a/packages/mapviewer/src/router/storeSync/SearchAutoSelectConfig.class.js b/packages/viewer/src/router/storeSync/SearchAutoSelectConfig.class.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/SearchAutoSelectConfig.class.js
rename to packages/viewer/src/router/storeSync/SearchAutoSelectConfig.class.js
diff --git a/packages/mapviewer/src/router/storeSync/SearchParamConfig.class.js b/packages/viewer/src/router/storeSync/SearchParamConfig.class.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/SearchParamConfig.class.js
rename to packages/viewer/src/router/storeSync/SearchParamConfig.class.js
diff --git a/packages/mapviewer/src/router/storeSync/SimpleUrlParamConfig.class.js b/packages/viewer/src/router/storeSync/SimpleUrlParamConfig.class.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/SimpleUrlParamConfig.class.js
rename to packages/viewer/src/router/storeSync/SimpleUrlParamConfig.class.js
diff --git a/packages/mapviewer/src/router/storeSync/TimeSliderParamConfig.class.js b/packages/viewer/src/router/storeSync/TimeSliderParamConfig.class.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/TimeSliderParamConfig.class.js
rename to packages/viewer/src/router/storeSync/TimeSliderParamConfig.class.js
diff --git a/packages/mapviewer/src/router/storeSync/ZoomParamConfig.class.js b/packages/viewer/src/router/storeSync/ZoomParamConfig.class.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/ZoomParamConfig.class.js
rename to packages/viewer/src/router/storeSync/ZoomParamConfig.class.js
diff --git a/packages/mapviewer/src/router/storeSync/__tests__/CameraParamConfig.class.spec.js b/packages/viewer/src/router/storeSync/__tests__/CameraParamConfig.class.spec.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/__tests__/CameraParamConfig.class.spec.js
rename to packages/viewer/src/router/storeSync/__tests__/CameraParamConfig.class.spec.js
diff --git a/packages/mapviewer/src/router/storeSync/__tests__/LayerParamConfig.class.spec.js b/packages/viewer/src/router/storeSync/__tests__/LayerParamConfig.class.spec.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/__tests__/LayerParamConfig.class.spec.js
rename to packages/viewer/src/router/storeSync/__tests__/LayerParamConfig.class.spec.js
diff --git a/packages/mapviewer/src/router/storeSync/__tests__/SimpleUrlParamConfig.class.spec.js b/packages/viewer/src/router/storeSync/__tests__/SimpleUrlParamConfig.class.spec.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/__tests__/SimpleUrlParamConfig.class.spec.js
rename to packages/viewer/src/router/storeSync/__tests__/SimpleUrlParamConfig.class.spec.js
diff --git a/packages/mapviewer/src/router/storeSync/__tests__/abstractParamConfig.class.spec.js b/packages/viewer/src/router/storeSync/__tests__/abstractParamConfig.class.spec.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/__tests__/abstractParamConfig.class.spec.js
rename to packages/viewer/src/router/storeSync/__tests__/abstractParamConfig.class.spec.js
diff --git a/packages/mapviewer/src/router/storeSync/__tests__/layersParamParser.spec.js b/packages/viewer/src/router/storeSync/__tests__/layersParamParser.spec.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/__tests__/layersParamParser.spec.js
rename to packages/viewer/src/router/storeSync/__tests__/layersParamParser.spec.js
diff --git a/packages/mapviewer/src/router/storeSync/abstractParamConfig.class.js b/packages/viewer/src/router/storeSync/abstractParamConfig.class.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/abstractParamConfig.class.js
rename to packages/viewer/src/router/storeSync/abstractParamConfig.class.js
diff --git a/packages/mapviewer/src/router/storeSync/index.js b/packages/viewer/src/router/storeSync/index.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/index.js
rename to packages/viewer/src/router/storeSync/index.js
diff --git a/packages/mapviewer/src/router/storeSync/layersParamParser.js b/packages/viewer/src/router/storeSync/layersParamParser.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/layersParamParser.js
rename to packages/viewer/src/router/storeSync/layersParamParser.js
diff --git a/packages/mapviewer/src/router/storeSync/storeSync.config.js b/packages/viewer/src/router/storeSync/storeSync.config.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/storeSync.config.js
rename to packages/viewer/src/router/storeSync/storeSync.config.js
diff --git a/packages/mapviewer/src/router/storeSync/storeSync.routerPlugin.js b/packages/viewer/src/router/storeSync/storeSync.routerPlugin.js
similarity index 100%
rename from packages/mapviewer/src/router/storeSync/storeSync.routerPlugin.js
rename to packages/viewer/src/router/storeSync/storeSync.routerPlugin.js
diff --git a/packages/mapviewer/src/router/viewNames.js b/packages/viewer/src/router/viewNames.js
similarity index 100%
rename from packages/mapviewer/src/router/viewNames.js
rename to packages/viewer/src/router/viewNames.js
diff --git a/packages/mapviewer/src/scss/diemo.scss b/packages/viewer/src/scss/diemo.scss
similarity index 100%
rename from packages/mapviewer/src/scss/diemo.scss
rename to packages/viewer/src/scss/diemo.scss
diff --git a/packages/mapviewer/src/scss/exports.js b/packages/viewer/src/scss/exports.js
similarity index 100%
rename from packages/mapviewer/src/scss/exports.js
rename to packages/viewer/src/scss/exports.js
diff --git a/packages/mapviewer/src/scss/fonts/FrutigerLight/FrutigerLTStd-Light.eot b/packages/viewer/src/scss/fonts/FrutigerLight/FrutigerLTStd-Light.eot
similarity index 100%
rename from packages/mapviewer/src/scss/fonts/FrutigerLight/FrutigerLTStd-Light.eot
rename to packages/viewer/src/scss/fonts/FrutigerLight/FrutigerLTStd-Light.eot
diff --git a/packages/mapviewer/src/scss/fonts/FrutigerLight/FrutigerLTStd-Light.ttf b/packages/viewer/src/scss/fonts/FrutigerLight/FrutigerLTStd-Light.ttf
similarity index 100%
rename from packages/mapviewer/src/scss/fonts/FrutigerLight/FrutigerLTStd-Light.ttf
rename to packages/viewer/src/scss/fonts/FrutigerLight/FrutigerLTStd-Light.ttf
diff --git a/packages/mapviewer/src/scss/fonts/FrutigerLight/FrutigerLTStd-Light.woff b/packages/viewer/src/scss/fonts/FrutigerLight/FrutigerLTStd-Light.woff
similarity index 100%
rename from packages/mapviewer/src/scss/fonts/FrutigerLight/FrutigerLTStd-Light.woff
rename to packages/viewer/src/scss/fonts/FrutigerLight/FrutigerLTStd-Light.woff
diff --git a/packages/mapviewer/src/scss/fonts/FrutigerLight/FrutigerLTStd-Light.woff2 b/packages/viewer/src/scss/fonts/FrutigerLight/FrutigerLTStd-Light.woff2
similarity index 100%
rename from packages/mapviewer/src/scss/fonts/FrutigerLight/FrutigerLTStd-Light.woff2
rename to packages/viewer/src/scss/fonts/FrutigerLight/FrutigerLTStd-Light.woff2
diff --git a/packages/mapviewer/src/scss/main.scss b/packages/viewer/src/scss/main.scss
similarity index 100%
rename from packages/mapviewer/src/scss/main.scss
rename to packages/viewer/src/scss/main.scss
diff --git a/packages/mapviewer/src/scss/media-query.mixin.scss b/packages/viewer/src/scss/media-query.mixin.scss
similarity index 100%
rename from packages/mapviewer/src/scss/media-query.mixin.scss
rename to packages/viewer/src/scss/media-query.mixin.scss
diff --git a/packages/mapviewer/src/scss/variables-admin.module.scss b/packages/viewer/src/scss/variables-admin.module.scss
similarity index 100%
rename from packages/mapviewer/src/scss/variables-admin.module.scss
rename to packages/viewer/src/scss/variables-admin.module.scss
diff --git a/packages/mapviewer/src/scss/variables.module.scss b/packages/viewer/src/scss/variables.module.scss
similarity index 100%
rename from packages/mapviewer/src/scss/variables.module.scss
rename to packages/viewer/src/scss/variables.module.scss
diff --git a/packages/mapviewer/src/scss/vue-transitions.mixin.scss b/packages/viewer/src/scss/vue-transitions.mixin.scss
similarity index 100%
rename from packages/mapviewer/src/scss/vue-transitions.mixin.scss
rename to packages/viewer/src/scss/vue-transitions.mixin.scss
diff --git a/packages/mapviewer/src/scss/webmapviewer-bootstrap-theme.scss b/packages/viewer/src/scss/webmapviewer-bootstrap-theme.scss
similarity index 100%
rename from packages/mapviewer/src/scss/webmapviewer-bootstrap-theme.scss
rename to packages/viewer/src/scss/webmapviewer-bootstrap-theme.scss
diff --git a/packages/mapviewer/src/service-workers.ts b/packages/viewer/src/service-workers.ts
similarity index 100%
rename from packages/mapviewer/src/service-workers.ts
rename to packages/viewer/src/service-workers.ts
diff --git a/packages/mapviewer/src/setup-fontawesome.js b/packages/viewer/src/setup-fontawesome.js
similarity index 100%
rename from packages/mapviewer/src/setup-fontawesome.js
rename to packages/viewer/src/setup-fontawesome.js
diff --git a/packages/mapviewer/src/store/README.md b/packages/viewer/src/store/README.md
similarity index 100%
rename from packages/mapviewer/src/store/README.md
rename to packages/viewer/src/store/README.md
diff --git a/packages/mapviewer/src/store/debug.store.js b/packages/viewer/src/store/debug.store.js
similarity index 100%
rename from packages/mapviewer/src/store/debug.store.js
rename to packages/viewer/src/store/debug.store.js
diff --git a/packages/mapviewer/src/store/index.js b/packages/viewer/src/store/index.js
similarity index 100%
rename from packages/mapviewer/src/store/index.js
rename to packages/viewer/src/store/index.js
diff --git a/packages/mapviewer/src/store/modules/__tests__/layers.store.spec.js b/packages/viewer/src/store/modules/__tests__/layers.store.spec.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/__tests__/layers.store.spec.js
rename to packages/viewer/src/store/modules/__tests__/layers.store.spec.js
diff --git a/packages/mapviewer/src/store/modules/__tests__/profile.store.spec.js b/packages/viewer/src/store/modules/__tests__/profile.store.spec.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/__tests__/profile.store.spec.js
rename to packages/viewer/src/store/modules/__tests__/profile.store.spec.js
diff --git a/packages/mapviewer/src/store/modules/__tests__/rotation.store.spec.js b/packages/viewer/src/store/modules/__tests__/rotation.store.spec.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/__tests__/rotation.store.spec.js
rename to packages/viewer/src/store/modules/__tests__/rotation.store.spec.js
diff --git a/packages/mapviewer/src/store/modules/__tests__/zoom.store.spec.js b/packages/viewer/src/store/modules/__tests__/zoom.store.spec.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/__tests__/zoom.store.spec.js
rename to packages/viewer/src/store/modules/__tests__/zoom.store.spec.js
diff --git a/packages/mapviewer/src/store/modules/app.store.js b/packages/viewer/src/store/modules/app.store.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/app.store.js
rename to packages/viewer/src/store/modules/app.store.js
diff --git a/packages/mapviewer/src/store/modules/cesium.store.js b/packages/viewer/src/store/modules/cesium.store.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/cesium.store.js
rename to packages/viewer/src/store/modules/cesium.store.js
diff --git a/packages/mapviewer/src/store/modules/drawing.store.js b/packages/viewer/src/store/modules/drawing.store.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/drawing.store.js
rename to packages/viewer/src/store/modules/drawing.store.js
diff --git a/packages/mapviewer/src/store/modules/features.store.js b/packages/viewer/src/store/modules/features.store.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/features.store.js
rename to packages/viewer/src/store/modules/features.store.js
diff --git a/packages/mapviewer/src/store/modules/geolocation.store.js b/packages/viewer/src/store/modules/geolocation.store.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/geolocation.store.js
rename to packages/viewer/src/store/modules/geolocation.store.js
diff --git a/packages/mapviewer/src/store/modules/i18n.store.js b/packages/viewer/src/store/modules/i18n.store.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/i18n.store.js
rename to packages/viewer/src/store/modules/i18n.store.js
diff --git a/packages/mapviewer/src/store/modules/layers.store.js b/packages/viewer/src/store/modules/layers.store.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/layers.store.js
rename to packages/viewer/src/store/modules/layers.store.js
diff --git a/packages/mapviewer/src/store/modules/map.store.js b/packages/viewer/src/store/modules/map.store.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/map.store.js
rename to packages/viewer/src/store/modules/map.store.js
diff --git a/packages/mapviewer/src/store/modules/position.store.js b/packages/viewer/src/store/modules/position.store.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/position.store.js
rename to packages/viewer/src/store/modules/position.store.js
diff --git a/packages/mapviewer/src/store/modules/print.store.js b/packages/viewer/src/store/modules/print.store.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/print.store.js
rename to packages/viewer/src/store/modules/print.store.js
diff --git a/packages/mapviewer/src/store/modules/profile.store.js b/packages/viewer/src/store/modules/profile.store.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/profile.store.js
rename to packages/viewer/src/store/modules/profile.store.js
diff --git a/packages/mapviewer/src/store/modules/search.store.js b/packages/viewer/src/store/modules/search.store.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/search.store.js
rename to packages/viewer/src/store/modules/search.store.js
diff --git a/packages/mapviewer/src/store/modules/share.store.js b/packages/viewer/src/store/modules/share.store.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/share.store.js
rename to packages/viewer/src/store/modules/share.store.js
diff --git a/packages/mapviewer/src/store/modules/topics.store.js b/packages/viewer/src/store/modules/topics.store.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/topics.store.js
rename to packages/viewer/src/store/modules/topics.store.js
diff --git a/packages/mapviewer/src/store/modules/ui.store.js b/packages/viewer/src/store/modules/ui.store.js
similarity index 100%
rename from packages/mapviewer/src/store/modules/ui.store.js
rename to packages/viewer/src/store/modules/ui.store.js
diff --git a/packages/mapviewer/src/store/plugins/2d-to-3d-management.plugin.js b/packages/viewer/src/store/plugins/2d-to-3d-management.plugin.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/2d-to-3d-management.plugin.js
rename to packages/viewer/src/store/plugins/2d-to-3d-management.plugin.js
diff --git a/packages/mapviewer/src/store/plugins/app-readiness.plugin.js b/packages/viewer/src/store/plugins/app-readiness.plugin.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/app-readiness.plugin.js
rename to packages/viewer/src/store/plugins/app-readiness.plugin.js
diff --git a/packages/mapviewer/src/store/plugins/click-on-map-management.plugin.js b/packages/viewer/src/store/plugins/click-on-map-management.plugin.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/click-on-map-management.plugin.js
rename to packages/viewer/src/store/plugins/click-on-map-management.plugin.js
diff --git a/packages/mapviewer/src/store/plugins/external-layers.plugin.js b/packages/viewer/src/store/plugins/external-layers.plugin.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/external-layers.plugin.js
rename to packages/viewer/src/store/plugins/external-layers.plugin.js
diff --git a/packages/mapviewer/src/store/plugins/geolocation-management.plugin.js b/packages/viewer/src/store/plugins/geolocation-management.plugin.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/geolocation-management.plugin.js
rename to packages/viewer/src/store/plugins/geolocation-management.plugin.js
diff --git a/packages/mapviewer/src/store/plugins/load-cog-metadata.plugin.js b/packages/viewer/src/store/plugins/load-cog-metadata.plugin.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/load-cog-metadata.plugin.js
rename to packages/viewer/src/store/plugins/load-cog-metadata.plugin.js
diff --git a/packages/mapviewer/src/store/plugins/load-geojson-style-and-data.plugin.js b/packages/viewer/src/store/plugins/load-geojson-style-and-data.plugin.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/load-geojson-style-and-data.plugin.js
rename to packages/viewer/src/store/plugins/load-geojson-style-and-data.plugin.js
diff --git a/packages/mapviewer/src/store/plugins/load-gpx-data.plugin.js b/packages/viewer/src/store/plugins/load-gpx-data.plugin.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/load-gpx-data.plugin.js
rename to packages/viewer/src/store/plugins/load-gpx-data.plugin.js
diff --git a/packages/mapviewer/src/store/plugins/load-kml-kmz-data.plugin.js b/packages/viewer/src/store/plugins/load-kml-kmz-data.plugin.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/load-kml-kmz-data.plugin.js
rename to packages/viewer/src/store/plugins/load-kml-kmz-data.plugin.js
diff --git a/packages/mapviewer/src/store/plugins/load-layersconfig-on-lang-change.js b/packages/viewer/src/store/plugins/load-layersconfig-on-lang-change.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/load-layersconfig-on-lang-change.js
rename to packages/viewer/src/store/plugins/load-layersconfig-on-lang-change.js
diff --git a/packages/mapviewer/src/store/plugins/redo-search-when-needed.plugin.js b/packages/viewer/src/store/plugins/redo-search-when-needed.plugin.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/redo-search-when-needed.plugin.js
rename to packages/viewer/src/store/plugins/redo-search-when-needed.plugin.js
diff --git a/packages/mapviewer/src/store/plugins/reproject-layers-on-projection-change.plugin.js b/packages/viewer/src/store/plugins/reproject-layers-on-projection-change.plugin.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/reproject-layers-on-projection-change.plugin.js
rename to packages/viewer/src/store/plugins/reproject-layers-on-projection-change.plugin.js
diff --git a/packages/mapviewer/src/store/plugins/screen-size-management.plugin.js b/packages/viewer/src/store/plugins/screen-size-management.plugin.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/screen-size-management.plugin.js
rename to packages/viewer/src/store/plugins/screen-size-management.plugin.js
diff --git a/packages/mapviewer/src/store/plugins/sync-camera-lonlatzoom.js b/packages/viewer/src/store/plugins/sync-camera-lonlatzoom.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/sync-camera-lonlatzoom.js
rename to packages/viewer/src/store/plugins/sync-camera-lonlatzoom.js
diff --git a/packages/mapviewer/src/store/plugins/topic-change-management.plugin.js b/packages/viewer/src/store/plugins/topic-change-management.plugin.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/topic-change-management.plugin.js
rename to packages/viewer/src/store/plugins/topic-change-management.plugin.js
diff --git a/packages/mapviewer/src/store/plugins/update-selected-features.plugin.js b/packages/viewer/src/store/plugins/update-selected-features.plugin.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/update-selected-features.plugin.js
rename to packages/viewer/src/store/plugins/update-selected-features.plugin.js
diff --git a/packages/mapviewer/src/store/plugins/vuex-log.plugin.js b/packages/viewer/src/store/plugins/vuex-log.plugin.js
similarity index 100%
rename from packages/mapviewer/src/store/plugins/vuex-log.plugin.js
rename to packages/viewer/src/store/plugins/vuex-log.plugin.js
diff --git a/packages/mapviewer/src/utils/EventEmitter.class.js b/packages/viewer/src/utils/EventEmitter.class.js
similarity index 100%
rename from packages/mapviewer/src/utils/EventEmitter.class.js
rename to packages/viewer/src/utils/EventEmitter.class.js
diff --git a/packages/mapviewer/src/utils/__tests__/extentUtils.spec.js b/packages/viewer/src/utils/__tests__/extentUtils.spec.js
similarity index 100%
rename from packages/mapviewer/src/utils/__tests__/extentUtils.spec.js
rename to packages/viewer/src/utils/__tests__/extentUtils.spec.js
diff --git a/packages/mapviewer/src/utils/__tests__/geodesicManager.spec.js b/packages/viewer/src/utils/__tests__/geodesicManager.spec.js
similarity index 100%
rename from packages/mapviewer/src/utils/__tests__/geodesicManager.spec.js
rename to packages/viewer/src/utils/__tests__/geodesicManager.spec.js
diff --git a/packages/mapviewer/src/utils/__tests__/gpxUtils.spec.js b/packages/viewer/src/utils/__tests__/gpxUtils.spec.js
similarity index 100%
rename from packages/mapviewer/src/utils/__tests__/gpxUtils.spec.js
rename to packages/viewer/src/utils/__tests__/gpxUtils.spec.js
diff --git a/packages/mapviewer/src/utils/__tests__/kmlUtils.spec.js b/packages/viewer/src/utils/__tests__/kmlUtils.spec.js
similarity index 100%
rename from packages/mapviewer/src/utils/__tests__/kmlUtils.spec.js
rename to packages/viewer/src/utils/__tests__/kmlUtils.spec.js
diff --git a/packages/mapviewer/src/utils/__tests__/kml_feature_error.kml b/packages/viewer/src/utils/__tests__/kml_feature_error.kml
similarity index 100%
rename from packages/mapviewer/src/utils/__tests__/kml_feature_error.kml
rename to packages/viewer/src/utils/__tests__/kml_feature_error.kml
diff --git a/packages/mapviewer/src/utils/__tests__/legacyKmlUtils.spec.js b/packages/viewer/src/utils/__tests__/legacyKmlUtils.spec.js
similarity index 100%
rename from packages/mapviewer/src/utils/__tests__/legacyKmlUtils.spec.js
rename to packages/viewer/src/utils/__tests__/legacyKmlUtils.spec.js
diff --git a/packages/mapviewer/src/utils/__tests__/legacyLayerParamUtils.spec.js b/packages/viewer/src/utils/__tests__/legacyLayerParamUtils.spec.js
similarity index 100%
rename from packages/mapviewer/src/utils/__tests__/legacyLayerParamUtils.spec.js
rename to packages/viewer/src/utils/__tests__/legacyLayerParamUtils.spec.js
diff --git a/packages/mapviewer/src/utils/__tests__/mfgeoadmin3TestKml.kml b/packages/viewer/src/utils/__tests__/mfgeoadmin3TestKml.kml
similarity index 100%
rename from packages/mapviewer/src/utils/__tests__/mfgeoadmin3TestKml.kml
rename to packages/viewer/src/utils/__tests__/mfgeoadmin3TestKml.kml
diff --git a/packages/mapviewer/src/utils/__tests__/urlQuery.spec.js b/packages/viewer/src/utils/__tests__/urlQuery.spec.js
similarity index 100%
rename from packages/mapviewer/src/utils/__tests__/urlQuery.spec.js
rename to packages/viewer/src/utils/__tests__/urlQuery.spec.js
diff --git a/packages/mapviewer/src/utils/__tests__/utils.spec.js b/packages/viewer/src/utils/__tests__/utils.spec.js
similarity index 100%
rename from packages/mapviewer/src/utils/__tests__/utils.spec.js
rename to packages/viewer/src/utils/__tests__/utils.spec.js
diff --git a/packages/mapviewer/src/utils/__tests__/webmapviewerOffsetTestKml.kml b/packages/viewer/src/utils/__tests__/webmapviewerOffsetTestKml.kml
similarity index 100%
rename from packages/mapviewer/src/utils/__tests__/webmapviewerOffsetTestKml.kml
rename to packages/viewer/src/utils/__tests__/webmapviewerOffsetTestKml.kml
diff --git a/packages/mapviewer/src/utils/click-outside.js b/packages/viewer/src/utils/click-outside.js
similarity index 100%
rename from packages/mapviewer/src/utils/click-outside.js
rename to packages/viewer/src/utils/click-outside.js
diff --git a/packages/mapviewer/src/utils/components/AppVersion.vue b/packages/viewer/src/utils/components/AppVersion.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/AppVersion.vue
rename to packages/viewer/src/utils/components/AppVersion.vue
diff --git a/packages/mapviewer/src/utils/components/BlackBackdrop.vue b/packages/viewer/src/utils/components/BlackBackdrop.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/BlackBackdrop.vue
rename to packages/viewer/src/utils/components/BlackBackdrop.vue
diff --git a/packages/mapviewer/src/utils/components/CoordinateCopySlot.vue b/packages/viewer/src/utils/components/CoordinateCopySlot.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/CoordinateCopySlot.vue
rename to packages/viewer/src/utils/components/CoordinateCopySlot.vue
diff --git a/packages/mapviewer/src/utils/components/DragDropOverlay.vue b/packages/viewer/src/utils/components/DragDropOverlay.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/DragDropOverlay.vue
rename to packages/viewer/src/utils/components/DragDropOverlay.vue
diff --git a/packages/mapviewer/src/utils/components/DropdownButton.vue b/packages/viewer/src/utils/components/DropdownButton.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/DropdownButton.vue
rename to packages/viewer/src/utils/components/DropdownButton.vue
diff --git a/packages/mapviewer/src/utils/components/EmailInput.vue b/packages/viewer/src/utils/components/EmailInput.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/EmailInput.vue
rename to packages/viewer/src/utils/components/EmailInput.vue
diff --git a/packages/mapviewer/src/utils/components/ErrorWindow.vue b/packages/viewer/src/utils/components/ErrorWindow.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/ErrorWindow.vue
rename to packages/viewer/src/utils/components/ErrorWindow.vue
diff --git a/packages/mapviewer/src/utils/components/ExtLayerInfoButton.vue b/packages/viewer/src/utils/components/ExtLayerInfoButton.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/ExtLayerInfoButton.vue
rename to packages/viewer/src/utils/components/ExtLayerInfoButton.vue
diff --git a/packages/mapviewer/src/utils/components/FeedbackPopup.vue b/packages/viewer/src/utils/components/FeedbackPopup.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/FeedbackPopup.vue
rename to packages/viewer/src/utils/components/FeedbackPopup.vue
diff --git a/packages/mapviewer/src/utils/components/FileInput.vue b/packages/viewer/src/utils/components/FileInput.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/FileInput.vue
rename to packages/viewer/src/utils/components/FileInput.vue
diff --git a/packages/mapviewer/src/utils/components/LoadingBar.vue b/packages/viewer/src/utils/components/LoadingBar.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/LoadingBar.vue
rename to packages/viewer/src/utils/components/LoadingBar.vue
diff --git a/packages/mapviewer/src/utils/components/ModalPrintWithBackdrop.vue b/packages/viewer/src/utils/components/ModalPrintWithBackdrop.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/ModalPrintWithBackdrop.vue
rename to packages/viewer/src/utils/components/ModalPrintWithBackdrop.vue
diff --git a/packages/mapviewer/src/utils/components/ModalWithBackdrop.vue b/packages/viewer/src/utils/components/ModalWithBackdrop.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/ModalWithBackdrop.vue
rename to packages/viewer/src/utils/components/ModalWithBackdrop.vue
diff --git a/packages/mapviewer/src/utils/components/OpenFullAppLink.vue b/packages/viewer/src/utils/components/OpenFullAppLink.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/OpenFullAppLink.vue
rename to packages/viewer/src/utils/components/OpenFullAppLink.vue
diff --git a/packages/mapviewer/src/utils/components/PrintButton.vue b/packages/viewer/src/utils/components/PrintButton.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/PrintButton.vue
rename to packages/viewer/src/utils/components/PrintButton.vue
diff --git a/packages/mapviewer/src/utils/components/ProgressBar.vue b/packages/viewer/src/utils/components/ProgressBar.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/ProgressBar.vue
rename to packages/viewer/src/utils/components/ProgressBar.vue
diff --git a/packages/mapviewer/src/utils/components/SimpleWindow.vue b/packages/viewer/src/utils/components/SimpleWindow.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/SimpleWindow.vue
rename to packages/viewer/src/utils/components/SimpleWindow.vue
diff --git a/packages/mapviewer/src/utils/components/TextAreaInput.vue b/packages/viewer/src/utils/components/TextAreaInput.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/TextAreaInput.vue
rename to packages/viewer/src/utils/components/TextAreaInput.vue
diff --git a/packages/mapviewer/src/utils/components/TextInput.vue b/packages/viewer/src/utils/components/TextInput.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/TextInput.vue
rename to packages/viewer/src/utils/components/TextInput.vue
diff --git a/packages/mapviewer/src/utils/components/TextSearchMarker.vue b/packages/viewer/src/utils/components/TextSearchMarker.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/TextSearchMarker.vue
rename to packages/viewer/src/utils/components/TextSearchMarker.vue
diff --git a/packages/mapviewer/src/utils/components/TextTruncate.vue b/packages/viewer/src/utils/components/TextTruncate.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/TextTruncate.vue
rename to packages/viewer/src/utils/components/TextTruncate.vue
diff --git a/packages/mapviewer/src/utils/components/ThirdPartyDisclaimer.vue b/packages/viewer/src/utils/components/ThirdPartyDisclaimer.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/ThirdPartyDisclaimer.vue
rename to packages/viewer/src/utils/components/ThirdPartyDisclaimer.vue
diff --git a/packages/mapviewer/src/utils/components/WarningWindow.vue b/packages/viewer/src/utils/components/WarningWindow.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/WarningWindow.vue
rename to packages/viewer/src/utils/components/WarningWindow.vue
diff --git a/packages/mapviewer/src/utils/components/ZoomToExtentButton.vue b/packages/viewer/src/utils/components/ZoomToExtentButton.vue
similarity index 100%
rename from packages/mapviewer/src/utils/components/ZoomToExtentButton.vue
rename to packages/viewer/src/utils/components/ZoomToExtentButton.vue
diff --git a/packages/mapviewer/src/utils/composables/useComponentUniqueId.js b/packages/viewer/src/utils/composables/useComponentUniqueId.js
similarity index 100%
rename from packages/mapviewer/src/utils/composables/useComponentUniqueId.js
rename to packages/viewer/src/utils/composables/useComponentUniqueId.js
diff --git a/packages/mapviewer/src/utils/composables/useFieldValidation.js b/packages/viewer/src/utils/composables/useFieldValidation.js
similarity index 100%
rename from packages/mapviewer/src/utils/composables/useFieldValidation.js
rename to packages/viewer/src/utils/composables/useFieldValidation.js
diff --git a/packages/mapviewer/src/utils/composables/useMovableElement.composable.js b/packages/viewer/src/utils/composables/useMovableElement.composable.js
similarity index 100%
rename from packages/mapviewer/src/utils/composables/useMovableElement.composable.js
rename to packages/viewer/src/utils/composables/useMovableElement.composable.js
diff --git a/packages/mapviewer/src/utils/coordinates/__test__/coordinateExtractors.spec.js b/packages/viewer/src/utils/coordinates/__test__/coordinateExtractors.spec.js
similarity index 100%
rename from packages/mapviewer/src/utils/coordinates/__test__/coordinateExtractors.spec.js
rename to packages/viewer/src/utils/coordinates/__test__/coordinateExtractors.spec.js
diff --git a/packages/mapviewer/src/utils/coordinates/coordinateExtractors.js b/packages/viewer/src/utils/coordinates/coordinateExtractors.js
similarity index 100%
rename from packages/mapviewer/src/utils/coordinates/coordinateExtractors.js
rename to packages/viewer/src/utils/coordinates/coordinateExtractors.js
diff --git a/packages/mapviewer/src/utils/coordinates/coordinateFormat.js b/packages/viewer/src/utils/coordinates/coordinateFormat.js
similarity index 100%
rename from packages/mapviewer/src/utils/coordinates/coordinateFormat.js
rename to packages/viewer/src/utils/coordinates/coordinateFormat.js
diff --git a/packages/mapviewer/src/utils/debounce.ts b/packages/viewer/src/utils/debounce.ts
similarity index 100%
rename from packages/mapviewer/src/utils/debounce.ts
rename to packages/viewer/src/utils/debounce.ts
diff --git a/packages/mapviewer/src/utils/extentUtils.js b/packages/viewer/src/utils/extentUtils.js
similarity index 100%
rename from packages/mapviewer/src/utils/extentUtils.js
rename to packages/viewer/src/utils/extentUtils.js
diff --git a/packages/mapviewer/src/utils/featureStyleUtils.js b/packages/viewer/src/utils/featureStyleUtils.js
similarity index 100%
rename from packages/mapviewer/src/utils/featureStyleUtils.js
rename to packages/viewer/src/utils/featureStyleUtils.js
diff --git a/packages/mapviewer/src/utils/geoJsonUtils.js b/packages/viewer/src/utils/geoJsonUtils.js
similarity index 100%
rename from packages/mapviewer/src/utils/geoJsonUtils.js
rename to packages/viewer/src/utils/geoJsonUtils.js
diff --git a/packages/mapviewer/src/utils/geodesicManager.js b/packages/viewer/src/utils/geodesicManager.js
similarity index 100%
rename from packages/mapviewer/src/utils/geodesicManager.js
rename to packages/viewer/src/utils/geodesicManager.js
diff --git a/packages/mapviewer/src/utils/gpxUtils.js b/packages/viewer/src/utils/gpxUtils.js
similarity index 100%
rename from packages/mapviewer/src/utils/gpxUtils.js
rename to packages/viewer/src/utils/gpxUtils.js
diff --git a/packages/mapviewer/src/utils/identifyOnVectorLayer.js b/packages/viewer/src/utils/identifyOnVectorLayer.js
similarity index 100%
rename from packages/mapviewer/src/utils/identifyOnVectorLayer.js
rename to packages/viewer/src/utils/identifyOnVectorLayer.js
diff --git a/packages/mapviewer/src/utils/kmlUtils.js b/packages/viewer/src/utils/kmlUtils.js
similarity index 100%
rename from packages/mapviewer/src/utils/kmlUtils.js
rename to packages/viewer/src/utils/kmlUtils.js
diff --git a/packages/mapviewer/src/utils/layerUtils.js b/packages/viewer/src/utils/layerUtils.js
similarity index 100%
rename from packages/mapviewer/src/utils/layerUtils.js
rename to packages/viewer/src/utils/layerUtils.js
diff --git a/packages/mapviewer/src/utils/legacyLayerParamUtils.js b/packages/viewer/src/utils/legacyLayerParamUtils.js
similarity index 100%
rename from packages/mapviewer/src/utils/legacyLayerParamUtils.js
rename to packages/viewer/src/utils/legacyLayerParamUtils.js
diff --git a/packages/mapviewer/src/utils/militaryGridProjection.js b/packages/viewer/src/utils/militaryGridProjection.js
similarity index 100%
rename from packages/mapviewer/src/utils/militaryGridProjection.js
rename to packages/viewer/src/utils/militaryGridProjection.js
diff --git a/packages/mapviewer/src/utils/offline/OfflineReadinessStatus.vue b/packages/viewer/src/utils/offline/OfflineReadinessStatus.vue
similarity index 86%
rename from packages/mapviewer/src/utils/offline/OfflineReadinessStatus.vue
rename to packages/viewer/src/utils/offline/OfflineReadinessStatus.vue
index 8ade75a030..634b370e2b 100644
--- a/packages/mapviewer/src/utils/offline/OfflineReadinessStatus.vue
+++ b/packages/viewer/src/utils/offline/OfflineReadinessStatus.vue
@@ -13,8 +13,10 @@ import SimpleWindow from '@/utils/components/SimpleWindow.vue'
 // check for updates every hour
 const period = 60 * 60 * 1000
 
-const { withText = false } = defineProps<{
+const { withText = false, autoReloadOnUpdate = false } = defineProps<{
     withText?: boolean
+    /** Automatically reload the page when a new service worker takes control */
+    autoReloadOnUpdate?: boolean
 }>()
 
 const isServiceWorkerActive = ref(false)
@@ -76,6 +78,26 @@ const { offlineReady, needRefresh, updateServiceWorker } = useRegisterSW({
                 }
             })
         }
+
+        // Listen for when a new service worker takes control
+        if ('serviceWorker' in navigator) {
+            navigator.serviceWorker.addEventListener('controllerchange', () => {
+                log.info({
+                    title: 'OfflineReadinessStatus',
+                    titleColor: LogPreDefinedColor.Sky,
+                    messages: ['New service worker has taken control'],
+                })
+                
+                if (autoReloadOnUpdate) {
+                    log.info({
+                        title: 'OfflineReadinessStatus',
+                        titleColor: LogPreDefinedColor.Sky,
+                        messages: ['Auto-reloading page with new service worker'],
+                    })
+                    window.location.reload()
+                }
+            })
+        }
     },
 })
 
diff --git a/packages/mapviewer/src/utils/ol/format/KML.js b/packages/viewer/src/utils/ol/format/KML.js
similarity index 100%
rename from packages/mapviewer/src/utils/ol/format/KML.js
rename to packages/viewer/src/utils/ol/format/KML.js
diff --git a/packages/mapviewer/src/utils/searchParamUtils.js b/packages/viewer/src/utils/searchParamUtils.js
similarity index 100%
rename from packages/mapviewer/src/utils/searchParamUtils.js
rename to packages/viewer/src/utils/searchParamUtils.js
diff --git a/packages/mapviewer/src/utils/styleUtils.js b/packages/viewer/src/utils/styleUtils.js
similarity index 100%
rename from packages/mapviewer/src/utils/styleUtils.js
rename to packages/viewer/src/utils/styleUtils.js
diff --git a/packages/mapviewer/src/utils/url-router.js b/packages/viewer/src/utils/url-router.js
similarity index 100%
rename from packages/mapviewer/src/utils/url-router.js
rename to packages/viewer/src/utils/url-router.js
diff --git a/packages/mapviewer/src/utils/utils.js b/packages/viewer/src/utils/utils.js
similarity index 100%
rename from packages/mapviewer/src/utils/utils.js
rename to packages/viewer/src/utils/utils.js
diff --git a/packages/mapviewer/src/views/EmbedView.vue b/packages/viewer/src/views/EmbedView.vue
similarity index 100%
rename from packages/mapviewer/src/views/EmbedView.vue
rename to packages/viewer/src/views/EmbedView.vue
diff --git a/packages/mapviewer/src/views/LegacyParamsView.vue b/packages/viewer/src/views/LegacyParamsView.vue
similarity index 100%
rename from packages/mapviewer/src/views/LegacyParamsView.vue
rename to packages/viewer/src/views/LegacyParamsView.vue
diff --git a/packages/mapviewer/src/views/MapView.vue b/packages/viewer/src/views/MapView.vue
similarity index 100%
rename from packages/mapviewer/src/views/MapView.vue
rename to packages/viewer/src/views/MapView.vue
diff --git a/packages/mapviewer/src/views/PrintView.vue b/packages/viewer/src/views/PrintView.vue
similarity index 100%
rename from packages/mapviewer/src/views/PrintView.vue
rename to packages/viewer/src/views/PrintView.vue
diff --git a/packages/mapviewer/src/vite-env.d.ts b/packages/viewer/src/vite-env.d.ts
similarity index 100%
rename from packages/mapviewer/src/vite-env.d.ts
rename to packages/viewer/src/vite-env.d.ts
diff --git a/packages/mapviewer/tailwind.config.js b/packages/viewer/tailwind.config.js
similarity index 100%
rename from packages/mapviewer/tailwind.config.js
rename to packages/viewer/tailwind.config.js
diff --git a/packages/mapviewer/tests/README.md b/packages/viewer/tests/README.md
similarity index 100%
rename from packages/mapviewer/tests/README.md
rename to packages/viewer/tests/README.md
diff --git a/packages/mapviewer/tests/cypress/fixtures/256.jpeg b/packages/viewer/tests/cypress/fixtures/256.jpeg
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/256.jpeg
rename to packages/viewer/tests/cypress/fixtures/256.jpeg
diff --git a/packages/mapviewer/tests/cypress/fixtures/256.png b/packages/viewer/tests/cypress/fixtures/256.png
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/256.png
rename to packages/viewer/tests/cypress/fixtures/256.png
diff --git a/packages/mapviewer/tests/cypress/fixtures/3d/terrain-3d-layer.json b/packages/viewer/tests/cypress/fixtures/3d/terrain-3d-layer.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/3d/terrain-3d-layer.json
rename to packages/viewer/tests/cypress/fixtures/3d/terrain-3d-layer.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/3d/tile.terrain b/packages/viewer/tests/cypress/fixtures/3d/tile.terrain
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/3d/tile.terrain
rename to packages/viewer/tests/cypress/fixtures/3d/tile.terrain
diff --git a/packages/mapviewer/tests/cypress/fixtures/3d/tile.vctr b/packages/viewer/tests/cypress/fixtures/3d/tile.vctr
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/3d/tile.vctr
rename to packages/viewer/tests/cypress/fixtures/3d/tile.vctr
diff --git a/packages/mapviewer/tests/cypress/fixtures/3d/tileset.json b/packages/viewer/tests/cypress/fixtures/3d/tileset.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/3d/tileset.json
rename to packages/viewer/tests/cypress/fixtures/3d/tileset.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/catalogs.fixture.json b/packages/viewer/tests/cypress/fixtures/catalogs.fixture.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/catalogs.fixture.json
rename to packages/viewer/tests/cypress/fixtures/catalogs.fixture.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/external-wms-getcap-1.fixture.xml b/packages/viewer/tests/cypress/fixtures/external-wms-getcap-1.fixture.xml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/external-wms-getcap-1.fixture.xml
rename to packages/viewer/tests/cypress/fixtures/external-wms-getcap-1.fixture.xml
diff --git a/packages/mapviewer/tests/cypress/fixtures/external-wms-getcap-2.fixture.xml b/packages/viewer/tests/cypress/fixtures/external-wms-getcap-2.fixture.xml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/external-wms-getcap-2.fixture.xml
rename to packages/viewer/tests/cypress/fixtures/external-wms-getcap-2.fixture.xml
diff --git a/packages/mapviewer/tests/cypress/fixtures/external-wmts-getcap-1.fixture.xml b/packages/viewer/tests/cypress/fixtures/external-wmts-getcap-1.fixture.xml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/external-wmts-getcap-1.fixture.xml
rename to packages/viewer/tests/cypress/fixtures/external-wmts-getcap-1.fixture.xml
diff --git a/packages/mapviewer/tests/cypress/fixtures/external-wmts-getcap-2.fixture.xml b/packages/viewer/tests/cypress/fixtures/external-wmts-getcap-2.fixture.xml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/external-wmts-getcap-2.fixture.xml
rename to packages/viewer/tests/cypress/fixtures/external-wmts-getcap-2.fixture.xml
diff --git a/packages/mapviewer/tests/cypress/fixtures/features/featureDetail.fixture.json b/packages/viewer/tests/cypress/fixtures/features/featureDetail.fixture.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/features/featureDetail.fixture.json
rename to packages/viewer/tests/cypress/fixtures/features/featureDetail.fixture.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/features/features.fixture.json b/packages/viewer/tests/cypress/fixtures/features/features.fixture.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/features/features.fixture.json
rename to packages/viewer/tests/cypress/fixtures/features/features.fixture.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/geojson-style.fixture.json b/packages/viewer/tests/cypress/fixtures/geojson-style.fixture.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/geojson-style.fixture.json
rename to packages/viewer/tests/cypress/fixtures/geojson-style.fixture.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/geojson.fixture.json b/packages/viewer/tests/cypress/fixtures/geojson.fixture.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/geojson.fixture.json
rename to packages/viewer/tests/cypress/fixtures/geojson.fixture.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/html-popup-german.fixture.html b/packages/viewer/tests/cypress/fixtures/html-popup-german.fixture.html
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/html-popup-german.fixture.html
rename to packages/viewer/tests/cypress/fixtures/html-popup-german.fixture.html
diff --git a/packages/mapviewer/tests/cypress/fixtures/html-popup.fixture.html b/packages/viewer/tests/cypress/fixtures/html-popup.fixture.html
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/html-popup.fixture.html
rename to packages/viewer/tests/cypress/fixtures/html-popup.fixture.html
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/4-points.kml b/packages/viewer/tests/cypress/fixtures/import-tool/4-points.kml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/4-points.kml
rename to packages/viewer/tests/cypress/fixtures/import-tool/4-points.kml
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/big-external-kml-file.kml b/packages/viewer/tests/cypress/fixtures/import-tool/big-external-kml-file.kml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/big-external-kml-file.kml
rename to packages/viewer/tests/cypress/fixtures/import-tool/big-external-kml-file.kml
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/empty.kml b/packages/viewer/tests/cypress/fixtures/import-tool/empty.kml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/empty.kml
rename to packages/viewer/tests/cypress/fixtures/import-tool/empty.kml
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/external-gpx-file-multi-segment.gpx b/packages/viewer/tests/cypress/fixtures/import-tool/external-gpx-file-multi-segment.gpx
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/external-gpx-file-multi-segment.gpx
rename to packages/viewer/tests/cypress/fixtures/import-tool/external-gpx-file-multi-segment.gpx
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/external-gpx-file-multi-separated-segment.gpx b/packages/viewer/tests/cypress/fixtures/import-tool/external-gpx-file-multi-separated-segment.gpx
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/external-gpx-file-multi-separated-segment.gpx
rename to packages/viewer/tests/cypress/fixtures/import-tool/external-gpx-file-multi-separated-segment.gpx
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/external-gpx-file-out-of-bounds.gpx b/packages/viewer/tests/cypress/fixtures/import-tool/external-gpx-file-out-of-bounds.gpx
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/external-gpx-file-out-of-bounds.gpx
rename to packages/viewer/tests/cypress/fixtures/import-tool/external-gpx-file-out-of-bounds.gpx
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/external-gpx-file.gpx b/packages/viewer/tests/cypress/fixtures/import-tool/external-gpx-file.gpx
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/external-gpx-file.gpx
rename to packages/viewer/tests/cypress/fixtures/import-tool/external-gpx-file.gpx
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/external-kml-file.kml b/packages/viewer/tests/cypress/fixtures/import-tool/external-kml-file.kml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/external-kml-file.kml
rename to packages/viewer/tests/cypress/fixtures/import-tool/external-kml-file.kml
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/iframe-test.kml b/packages/viewer/tests/cypress/fixtures/import-tool/iframe-test.kml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/iframe-test.kml
rename to packages/viewer/tests/cypress/fixtures/import-tool/iframe-test.kml
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/kml-multi-polygon.kml b/packages/viewer/tests/cypress/fixtures/import-tool/kml-multi-polygon.kml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/kml-multi-polygon.kml
rename to packages/viewer/tests/cypress/fixtures/import-tool/kml-multi-polygon.kml
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/kml_feature_error.kml b/packages/viewer/tests/cypress/fixtures/import-tool/kml_feature_error.kml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/kml_feature_error.kml
rename to packages/viewer/tests/cypress/fixtures/import-tool/kml_feature_error.kml
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/legend.png b/packages/viewer/tests/cypress/fixtures/import-tool/legend.png
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/legend.png
rename to packages/viewer/tests/cypress/fixtures/import-tool/legend.png
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/line-accross-eu.kml b/packages/viewer/tests/cypress/fixtures/import-tool/line-accross-eu.kml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/line-accross-eu.kml
rename to packages/viewer/tests/cypress/fixtures/import-tool/line-accross-eu.kml
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/paris.kml b/packages/viewer/tests/cypress/fixtures/import-tool/paris.kml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/paris.kml
rename to packages/viewer/tests/cypress/fixtures/import-tool/paris.kml
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/second-external-kml-file.kml b/packages/viewer/tests/cypress/fixtures/import-tool/second-external-kml-file.kml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/second-external-kml-file.kml
rename to packages/viewer/tests/cypress/fixtures/import-tool/second-external-kml-file.kml
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/wms-geo-admin-get-capabilities.xml b/packages/viewer/tests/cypress/fixtures/import-tool/wms-geo-admin-get-capabilities.xml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/wms-geo-admin-get-capabilities.xml
rename to packages/viewer/tests/cypress/fixtures/import-tool/wms-geo-admin-get-capabilities.xml
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/wms-geo-admin-get-capabilities_sld_enabled.xml b/packages/viewer/tests/cypress/fixtures/import-tool/wms-geo-admin-get-capabilities_sld_enabled.xml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/wms-geo-admin-get-capabilities_sld_enabled.xml
rename to packages/viewer/tests/cypress/fixtures/import-tool/wms-geo-admin-get-capabilities_sld_enabled.xml
diff --git a/packages/mapviewer/tests/cypress/fixtures/import-tool/wmts-geo-admin-get-capabilities.xml b/packages/viewer/tests/cypress/fixtures/import-tool/wmts-geo-admin-get-capabilities.xml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/import-tool/wmts-geo-admin-get-capabilities.xml
rename to packages/viewer/tests/cypress/fixtures/import-tool/wmts-geo-admin-get-capabilities.xml
diff --git a/packages/mapviewer/tests/cypress/fixtures/infobox.fixture.html b/packages/viewer/tests/cypress/fixtures/infobox.fixture.html
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/infobox.fixture.html
rename to packages/viewer/tests/cypress/fixtures/infobox.fixture.html
diff --git a/packages/mapviewer/tests/cypress/fixtures/layers-german.fixture.json b/packages/viewer/tests/cypress/fixtures/layers-german.fixture.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/layers-german.fixture.json
rename to packages/viewer/tests/cypress/fixtures/layers-german.fixture.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/layers.fixture.json b/packages/viewer/tests/cypress/fixtures/layers.fixture.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/layers.fixture.json
rename to packages/viewer/tests/cypress/fixtures/layers.fixture.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/legend.fixture.html b/packages/viewer/tests/cypress/fixtures/legend.fixture.html
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/legend.fixture.html
rename to packages/viewer/tests/cypress/fixtures/legend.fixture.html
diff --git a/packages/mapviewer/tests/cypress/fixtures/post-kml.fixture.json b/packages/viewer/tests/cypress/fixtures/post-kml.fixture.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/post-kml.fixture.json
rename to packages/viewer/tests/cypress/fixtures/post-kml.fixture.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/print/capabilities.json b/packages/viewer/tests/cypress/fixtures/print/capabilities.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/print/capabilities.json
rename to packages/viewer/tests/cypress/fixtures/print/capabilities.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/print/label.kml b/packages/viewer/tests/cypress/fixtures/print/label.kml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/print/label.kml
rename to packages/viewer/tests/cypress/fixtures/print/label.kml
diff --git a/packages/mapviewer/tests/cypress/fixtures/print/line-and-marker.gpx b/packages/viewer/tests/cypress/fixtures/print/line-and-marker.gpx
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/print/line-and-marker.gpx
rename to packages/viewer/tests/cypress/fixtures/print/line-and-marker.gpx
diff --git a/packages/mapviewer/tests/cypress/fixtures/print/mapfish-print-report.pdf b/packages/viewer/tests/cypress/fixtures/print/mapfish-print-report.pdf
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/print/mapfish-print-report.pdf
rename to packages/viewer/tests/cypress/fixtures/print/mapfish-print-report.pdf
diff --git a/packages/mapviewer/tests/cypress/fixtures/print/old-geoadmin-label.kml b/packages/viewer/tests/cypress/fixtures/print/old-geoadmin-label.kml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/print/old-geoadmin-label.kml
rename to packages/viewer/tests/cypress/fixtures/print/old-geoadmin-label.kml
diff --git a/packages/mapviewer/tests/cypress/fixtures/service-alti/height.fixture.json b/packages/viewer/tests/cypress/fixtures/service-alti/height.fixture.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/service-alti/height.fixture.json
rename to packages/viewer/tests/cypress/fixtures/service-alti/height.fixture.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/service-alti/profile.fixture.csv b/packages/viewer/tests/cypress/fixtures/service-alti/profile.fixture.csv
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/service-alti/profile.fixture.csv
rename to packages/viewer/tests/cypress/fixtures/service-alti/profile.fixture.csv
diff --git a/packages/mapviewer/tests/cypress/fixtures/service-alti/profile.fixture.json b/packages/viewer/tests/cypress/fixtures/service-alti/profile.fixture.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/service-alti/profile.fixture.json
rename to packages/viewer/tests/cypress/fixtures/service-alti/profile.fixture.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/service-alti/profile.too.big.error.fixture.json b/packages/viewer/tests/cypress/fixtures/service-alti/profile.too.big.error.fixture.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/service-alti/profile.too.big.error.fixture.json
rename to packages/viewer/tests/cypress/fixtures/service-alti/profile.too.big.error.fixture.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/service-icons/placeholder.png b/packages/viewer/tests/cypress/fixtures/service-icons/placeholder.png
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/service-icons/placeholder.png
rename to packages/viewer/tests/cypress/fixtures/service-icons/placeholder.png
diff --git a/packages/mapviewer/tests/cypress/fixtures/service-icons/set-babs.fixture.json b/packages/viewer/tests/cypress/fixtures/service-icons/set-babs.fixture.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/service-icons/set-babs.fixture.json
rename to packages/viewer/tests/cypress/fixtures/service-icons/set-babs.fixture.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/service-icons/set-default.fixture.json b/packages/viewer/tests/cypress/fixtures/service-icons/set-default.fixture.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/service-icons/set-default.fixture.json
rename to packages/viewer/tests/cypress/fixtures/service-icons/set-default.fixture.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/service-icons/sets.fixture.json b/packages/viewer/tests/cypress/fixtures/service-icons/sets.fixture.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/service-icons/sets.fixture.json
rename to packages/viewer/tests/cypress/fixtures/service-icons/sets.fixture.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/service-kml/legacy-mf-geoadmin3.kml b/packages/viewer/tests/cypress/fixtures/service-kml/legacy-mf-geoadmin3.kml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/service-kml/legacy-mf-geoadmin3.kml
rename to packages/viewer/tests/cypress/fixtures/service-kml/legacy-mf-geoadmin3.kml
diff --git a/packages/mapviewer/tests/cypress/fixtures/service-kml/lonelyMarker.kml b/packages/viewer/tests/cypress/fixtures/service-kml/lonelyMarker.kml
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/service-kml/lonelyMarker.kml
rename to packages/viewer/tests/cypress/fixtures/service-kml/lonelyMarker.kml
diff --git a/packages/mapviewer/tests/cypress/fixtures/service-qrcode/position-popup.png b/packages/viewer/tests/cypress/fixtures/service-qrcode/position-popup.png
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/service-qrcode/position-popup.png
rename to packages/viewer/tests/cypress/fixtures/service-qrcode/position-popup.png
diff --git a/packages/mapviewer/tests/cypress/fixtures/topics.fixture.json b/packages/viewer/tests/cypress/fixtures/topics.fixture.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/topics.fixture.json
rename to packages/viewer/tests/cypress/fixtures/topics.fixture.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/what3word.fixture.json b/packages/viewer/tests/cypress/fixtures/what3word.fixture.json
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/what3word.fixture.json
rename to packages/viewer/tests/cypress/fixtures/what3word.fixture.json
diff --git a/packages/mapviewer/tests/cypress/fixtures/wms-geo-admin.png b/packages/viewer/tests/cypress/fixtures/wms-geo-admin.png
similarity index 100%
rename from packages/mapviewer/tests/cypress/fixtures/wms-geo-admin.png
rename to packages/viewer/tests/cypress/fixtures/wms-geo-admin.png
diff --git a/packages/mapviewer/tests/cypress/support/commands.js b/packages/viewer/tests/cypress/support/commands.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/support/commands.js
rename to packages/viewer/tests/cypress/support/commands.js
diff --git a/packages/mapviewer/tests/cypress/support/component-index.html b/packages/viewer/tests/cypress/support/component-index.html
similarity index 100%
rename from packages/mapviewer/tests/cypress/support/component-index.html
rename to packages/viewer/tests/cypress/support/component-index.html
diff --git a/packages/mapviewer/tests/cypress/support/component.js b/packages/viewer/tests/cypress/support/component.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/support/component.js
rename to packages/viewer/tests/cypress/support/component.js
diff --git a/packages/mapviewer/tests/cypress/support/drawing.js b/packages/viewer/tests/cypress/support/drawing.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/support/drawing.js
rename to packages/viewer/tests/cypress/support/drawing.js
diff --git a/packages/mapviewer/tests/cypress/support/e2e.js b/packages/viewer/tests/cypress/support/e2e.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/support/e2e.js
rename to packages/viewer/tests/cypress/support/e2e.js
diff --git a/packages/mapviewer/tests/cypress/support/intercepts.js b/packages/viewer/tests/cypress/support/intercepts.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/support/intercepts.js
rename to packages/viewer/tests/cypress/support/intercepts.js
diff --git a/packages/mapviewer/tests/cypress/support/utils.js b/packages/viewer/tests/cypress/support/utils.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/support/utils.js
rename to packages/viewer/tests/cypress/support/utils.js
diff --git a/packages/mapviewer/tests/cypress/tests-component/DropdownButton.cy.js b/packages/viewer/tests/cypress/tests-component/DropdownButton.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-component/DropdownButton.cy.js
rename to packages/viewer/tests/cypress/tests-component/DropdownButton.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-component/Inputs.cy.js b/packages/viewer/tests/cypress/tests-component/Inputs.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-component/Inputs.cy.js
rename to packages/viewer/tests/cypress/tests-component/Inputs.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-component/TextSearchMarker.cy.js b/packages/viewer/tests/cypress/tests-component/TextSearchMarker.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-component/TextSearchMarker.cy.js
rename to packages/viewer/tests/cypress/tests-component/TextSearchMarker.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-component/TextTruncate.cy.js b/packages/viewer/tests/cypress/tests-component/TextTruncate.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-component/TextTruncate.cy.js
rename to packages/viewer/tests/cypress/tests-component/TextTruncate.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/3d/click.cy.js b/packages/viewer/tests/cypress/tests-e2e/3d/click.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/3d/click.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/3d/click.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/3d/featureSelection.cy.js b/packages/viewer/tests/cypress/tests-e2e/3d/featureSelection.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/3d/featureSelection.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/3d/featureSelection.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/3d/geolocation.cy.js b/packages/viewer/tests/cypress/tests-e2e/3d/geolocation.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/3d/geolocation.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/3d/geolocation.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/3d/layers.cy.js b/packages/viewer/tests/cypress/tests-e2e/3d/layers.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/3d/layers.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/3d/layers.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/3d/navigation.cy.js b/packages/viewer/tests/cypress/tests-e2e/3d/navigation.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/3d/navigation.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/3d/navigation.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/3d/transitionTo3d.cy.js b/packages/viewer/tests/cypress/tests-e2e/3d/transitionTo3d.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/3d/transitionTo3d.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/3d/transitionTo3d.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/changeLanguage.cy.js b/packages/viewer/tests/cypress/tests-e2e/changeLanguage.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/changeLanguage.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/changeLanguage.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/compareSlider.cy.js b/packages/viewer/tests/cypress/tests-e2e/compareSlider.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/compareSlider.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/compareSlider.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/crosshair.cy.js b/packages/viewer/tests/cypress/tests-e2e/crosshair.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/crosshair.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/crosshair.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/drawing.cy.js b/packages/viewer/tests/cypress/tests-e2e/drawing.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/drawing.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/drawing.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/embed.cy.js b/packages/viewer/tests/cypress/tests-e2e/embed.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/embed.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/embed.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/featureSelection.cy.js b/packages/viewer/tests/cypress/tests-e2e/featureSelection.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/featureSelection.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/featureSelection.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/feedback.cy.js b/packages/viewer/tests/cypress/tests-e2e/feedback.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/feedback.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/feedback.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/feedbackTestUtils.js b/packages/viewer/tests/cypress/tests-e2e/feedbackTestUtils.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/feedbackTestUtils.js
rename to packages/viewer/tests/cypress/tests-e2e/feedbackTestUtils.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/footer.cy.js b/packages/viewer/tests/cypress/tests-e2e/footer.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/footer.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/footer.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/geodesicDrawing.cy.js b/packages/viewer/tests/cypress/tests-e2e/geodesicDrawing.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/geodesicDrawing.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/geodesicDrawing.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/geolocation.cy.js b/packages/viewer/tests/cypress/tests-e2e/geolocation.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/geolocation.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/geolocation.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/header.cy.js b/packages/viewer/tests/cypress/tests-e2e/header.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/header.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/header.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/importToolFile.cy.js b/packages/viewer/tests/cypress/tests-e2e/importToolFile.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/importToolFile.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/importToolFile.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/importToolMaps.cy.js b/packages/viewer/tests/cypress/tests-e2e/importToolMaps.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/importToolMaps.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/importToolMaps.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/infobox.cy.js b/packages/viewer/tests/cypress/tests-e2e/infobox.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/infobox.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/infobox.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/layers.cy.js b/packages/viewer/tests/cypress/tests-e2e/layers.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/layers.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/layers.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/legacyParamImport.cy.js b/packages/viewer/tests/cypress/tests-e2e/legacyParamImport.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/legacyParamImport.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/legacyParamImport.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/menuTray.cy.js b/packages/viewer/tests/cypress/tests-e2e/menuTray.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/menuTray.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/menuTray.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/mouseposition.cy.js b/packages/viewer/tests/cypress/tests-e2e/mouseposition.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/mouseposition.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/mouseposition.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/print.cy.js b/packages/viewer/tests/cypress/tests-e2e/print.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/print.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/print.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/reportProblem.cy.js b/packages/viewer/tests/cypress/tests-e2e/reportProblem.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/reportProblem.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/reportProblem.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/ribbon.cy.js b/packages/viewer/tests/cypress/tests-e2e/ribbon.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/ribbon.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/ribbon.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/search/coordinates-search.cy.js b/packages/viewer/tests/cypress/tests-e2e/search/coordinates-search.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/search/coordinates-search.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/search/coordinates-search.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/search/search-results.cy.js b/packages/viewer/tests/cypress/tests-e2e/search/search-results.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/search/search-results.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/search/search-results.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/shareShortLink.cy.js b/packages/viewer/tests/cypress/tests-e2e/shareShortLink.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/shareShortLink.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/shareShortLink.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/timeCompareSlider.cy.js b/packages/viewer/tests/cypress/tests-e2e/timeCompareSlider.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/timeCompareSlider.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/timeCompareSlider.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/timeSlider.cy.js b/packages/viewer/tests/cypress/tests-e2e/timeSlider.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/timeSlider.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/timeSlider.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/toolboxRight.cy.js b/packages/viewer/tests/cypress/tests-e2e/toolboxRight.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/toolboxRight.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/toolboxRight.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/topics.cy.js b/packages/viewer/tests/cypress/tests-e2e/topics.cy.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/topics.cy.js
rename to packages/viewer/tests/cypress/tests-e2e/topics.cy.js
diff --git a/packages/mapviewer/tests/cypress/tests-e2e/utils.js b/packages/viewer/tests/cypress/tests-e2e/utils.js
similarity index 100%
rename from packages/mapviewer/tests/cypress/tests-e2e/utils.js
rename to packages/viewer/tests/cypress/tests-e2e/utils.js
diff --git a/packages/mapviewer/tests/samples/kml/alpen.kml b/packages/viewer/tests/samples/kml/alpen.kml
similarity index 100%
rename from packages/mapviewer/tests/samples/kml/alpen.kml
rename to packages/viewer/tests/samples/kml/alpen.kml
diff --git a/packages/mapviewer/tests/samples/kml/atomGeneratorGlacier.kml b/packages/viewer/tests/samples/kml/atomGeneratorGlacier.kml
similarity index 100%
rename from packages/mapviewer/tests/samples/kml/atomGeneratorGlacier.kml
rename to packages/viewer/tests/samples/kml/atomGeneratorGlacier.kml
diff --git a/packages/mapviewer/tests/samples/kml/externalContent.kml b/packages/viewer/tests/samples/kml/externalContent.kml
similarity index 100%
rename from packages/mapviewer/tests/samples/kml/externalContent.kml
rename to packages/viewer/tests/samples/kml/externalContent.kml
diff --git a/packages/mapviewer/tests/samples/kml/legacy-chsdi3-icon-urls.kml b/packages/viewer/tests/samples/kml/legacy-chsdi3-icon-urls.kml
similarity index 100%
rename from packages/mapviewer/tests/samples/kml/legacy-chsdi3-icon-urls.kml
rename to packages/viewer/tests/samples/kml/legacy-chsdi3-icon-urls.kml
diff --git a/packages/mapviewer/tests/samples/kml/print.kml b/packages/viewer/tests/samples/kml/print.kml
similarity index 100%
rename from packages/mapviewer/tests/samples/kml/print.kml
rename to packages/viewer/tests/samples/kml/print.kml
diff --git a/packages/mapviewer/tests/setup-vitest.ts b/packages/viewer/tests/setup-vitest.ts
similarity index 100%
rename from packages/mapviewer/tests/setup-vitest.ts
rename to packages/viewer/tests/setup-vitest.ts
diff --git a/packages/mapviewer/tsconfig.json b/packages/viewer/tsconfig.json
similarity index 100%
rename from packages/mapviewer/tsconfig.json
rename to packages/viewer/tsconfig.json
diff --git a/packages/mapviewer/vite-plugins/vite-plugin-generate-build-info.js b/packages/viewer/vite-plugins/vite-plugin-generate-build-info.js
similarity index 100%
rename from packages/mapviewer/vite-plugins/vite-plugin-generate-build-info.js
rename to packages/viewer/vite-plugins/vite-plugin-generate-build-info.js
diff --git a/packages/mapviewer/vite-plugins/vite-plugin-watch-node-modules.ts b/packages/viewer/vite-plugins/vite-plugin-watch-node-modules.ts
similarity index 100%
rename from packages/mapviewer/vite-plugins/vite-plugin-watch-node-modules.ts
rename to packages/viewer/vite-plugins/vite-plugin-watch-node-modules.ts
diff --git a/packages/mapviewer/vite.config.mts b/packages/viewer/vite.config.mts
similarity index 100%
rename from packages/mapviewer/vite.config.mts
rename to packages/viewer/vite.config.mts