diff --git a/marbledata/bitmaps/default_location.png b/marbledata/bitmaps/default_location.png
new file mode 100644
index 000000000..3d4f3b5c3
Binary files /dev/null and b/marbledata/bitmaps/default_location.png differ
diff --git a/googlemaps/0/0/0.png b/marbledata/maps/earth/googlemaps/0/0/0.png
similarity index 100%
rename from googlemaps/0/0/0.png
rename to marbledata/maps/earth/googlemaps/0/0/0.png
diff --git a/googlemaps/googlemaps.dgml b/marbledata/maps/earth/googlemaps/googlemaps.dgml
similarity index 100%
rename from googlemaps/googlemaps.dgml
rename to marbledata/maps/earth/googlemaps/googlemaps.dgml
diff --git a/googlemaps/preview.png b/marbledata/maps/earth/googlemaps/preview.png
similarity index 100%
rename from googlemaps/preview.png
rename to marbledata/maps/earth/googlemaps/preview.png
diff --git a/googlesat/0/0/0.jpg b/marbledata/maps/earth/googlesat/0/0/0.jpg
similarity index 100%
rename from googlesat/0/0/0.jpg
rename to marbledata/maps/earth/googlesat/0/0/0.jpg
diff --git a/googlesat/bicycle/0/0/0.png b/marbledata/maps/earth/googlesat/bicycle/0/0/0.png
similarity index 100%
rename from googlesat/bicycle/0/0/0.png
rename to marbledata/maps/earth/googlesat/bicycle/0/0/0.png
diff --git a/googlesat/googlesat.dgml b/marbledata/maps/earth/googlesat/googlesat.dgml
similarity index 100%
rename from googlesat/googlesat.dgml
rename to marbledata/maps/earth/googlesat/googlesat.dgml
diff --git a/googlesat/preview.png b/marbledata/maps/earth/googlesat/preview.png
similarity index 100%
rename from googlesat/preview.png
rename to marbledata/maps/earth/googlesat/preview.png
diff --git a/googlesat/streets/0/0/0.png b/marbledata/maps/earth/googlesat/streets/0/0/0.png
similarity index 100%
rename from googlesat/streets/0/0/0.png
rename to marbledata/maps/earth/googlesat/streets/0/0/0.png
diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp
index 0bd8f3d83..014a84a09 100644
--- a/qt-ui/globe.cpp
+++ b/qt-ui/globe.cpp
@@ -8,6 +8,7 @@
 #include <marble/GeoDataPlacemark.h>
 #include <marble/GeoDataDocument.h>
 #include <marble/MarbleModel.h>
+#include <marble/MarbleDirs.h>
 #if INCOMPLETE_MARBLE
 #include "marble/GeoDataTreeModel.h"
 #else
@@ -18,6 +19,9 @@
 
 GlobeGPS::GlobeGPS(QWidget* parent) : MarbleWidget(parent), loadedDives(0)
 {
+	// this will find the Google maps when running from your build directory
+	// TODO: all the magic to find the install path (and actually install/bundle these files)
+	MarbleDirs::setMarbleDataPath(QDir("./marbledata").absolutePath());
 	messageWidget = new KMessageWidget(this);
 	messageWidget->setCloseButtonVisible(false);
 	messageWidget->setHidden(true);