diff --git a/.appveyor.yml b/.appveyor.yml
index 05423011..5c315456 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -29,8 +29,8 @@ build_script:
     copy release\GPXSee.exe installer
     windeployqt --release installer\GPXSee.exe
     copy pkg\windows\gpxsee64.nsi installer
-    xcopy pkg\common\csv installer\csv /i
-    xcopy pkg\common\maps installer\maps /i
+    xcopy data\csv installer\csv /i
+    xcopy data\maps installer\maps /i
     xcopy lang\*.qm installer\translations\ /sy
     xcopy icons\symbols installer\symbols /i
     copy licence.txt installer
diff --git a/pkg/common/csv/ellipsoids.csv b/data/csv/ellipsoids.csv
similarity index 100%
rename from pkg/common/csv/ellipsoids.csv
rename to data/csv/ellipsoids.csv
diff --git a/pkg/common/csv/gcs.csv b/data/csv/gcs.csv
similarity index 100%
rename from pkg/common/csv/gcs.csv
rename to data/csv/gcs.csv
diff --git a/pkg/common/csv/pcs.csv b/data/csv/pcs.csv
similarity index 100%
rename from pkg/common/csv/pcs.csv
rename to data/csv/pcs.csv
diff --git a/pkg/common/maps/4UMaps.xml b/data/maps/4UMaps.xml
similarity index 100%
rename from pkg/common/maps/4UMaps.xml
rename to data/maps/4UMaps.xml
diff --git a/pkg/common/maps/Antarctica.xml b/data/maps/Antarctica.xml
similarity index 100%
rename from pkg/common/maps/Antarctica.xml
rename to data/maps/Antarctica.xml
diff --git a/pkg/common/maps/OpenStreetMap.xml b/data/maps/OpenStreetMap.xml
similarity index 100%
rename from pkg/common/maps/OpenStreetMap.xml
rename to data/maps/OpenStreetMap.xml
diff --git a/pkg/common/maps/OpenTopoMap.xml b/data/maps/OpenTopoMap.xml
similarity index 100%
rename from pkg/common/maps/OpenTopoMap.xml
rename to data/maps/OpenTopoMap.xml
diff --git a/pkg/common/maps/USGS-imagery.xml b/data/maps/USGS-imagery.xml
similarity index 100%
rename from pkg/common/maps/USGS-imagery.xml
rename to data/maps/USGS-imagery.xml
diff --git a/pkg/common/maps/USGS-topo.xml b/data/maps/USGS-topo.xml
similarity index 100%
rename from pkg/common/maps/USGS-topo.xml
rename to data/maps/USGS-topo.xml
diff --git a/data/default.xml b/data/mapsforge/default.xml
similarity index 100%
rename from data/default.xml
rename to data/mapsforge/default.xml
diff --git a/gpxsee.pro b/gpxsee.pro
index 76fde7a7..e23d3a93 100644
--- a/gpxsee.pro
+++ b/gpxsee.pro
@@ -482,9 +482,9 @@ macx {
     locale.path = Contents/Resources/translations
     locale.files = $$files(lang/*.qm)
     csv.path = Contents/Resources
-    csv.files = pkg/common/csv
+    csv.files = data/csv
     maps.path = Contents/Resources
-    maps.files = pkg/common/maps
+    maps.files = data/maps
     symbols.path = Contents/Resources/symbols
     symbols.files = $$files(icons/symbols/*.png)
     icons.path = Contents/Resources/icons
@@ -537,9 +537,9 @@ win32 {
 unix:!macx:!android {
     isEmpty(PREFIX):PREFIX = /usr/local
 
-    maps.files = $$files(pkg/common/maps/*)
+    maps.files = $$files(data/maps/*)
     maps.path = $$PREFIX/share/gpxsee/maps
-    csv.files = $$files(pkg/common/csv/*)
+    csv.files = $$files(data/csv/*)
     csv.path = $$PREFIX/share/gpxsee/csv
     symbols.files = $$files(icons/symbols/*.png)
     symbols.path = $$PREFIX/share/gpxsee/symbols
@@ -587,9 +587,9 @@ android {
         pkg/android/build.gradle \
         pkg/android/res/values/libs.xml
 
-    maps.files = $$files(pkg/common/maps/*)
+    maps.files = $$files(data/maps/*)
     maps.path = /assets/maps
-    csv.files = $$files(pkg/common/csv/*)
+    csv.files = $$files(data/csv/*)
     csv.path = /assets/csv
     symbols.files = $$files(icons/symbols/*.png)
     symbols.path = /assets/symbols
diff --git a/gpxsee.qrc b/gpxsee.qrc
index 1fa61de6..208469de 100644
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@@ -204,7 +204,7 @@
 
 	<!-- Mapsforge rendertheme -->
 	<qresource prefix="/mapsforge">
-		<file alias="default.xml">data/default.xml</file>
+		<file alias="default.xml">data/mapsforge/default.xml</file>
 
 		<file alias="patterns/hills.svg">icons/map/mapsforge/patterns/hills.svg</file>
 		<file alias="patterns/farmland.svg">icons/map/mapsforge/patterns/farmland.svg</file>