diff --git a/.gitignore b/.gitignore
index 90ad486..0b47f45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,9 @@ moc_*.cpp
 prototypes/gst/
 qrc_*.cpp
 *.moc
+src/*/mocs/
+src/*/objs/
+src/*/qrc/
 
 # Folders not to be included
 html/
diff --git a/Doxyfile b/docs/Doxyfile
similarity index 100%
rename from Doxyfile
rename to docs/Doxyfile
diff --git a/src/mapmap/docs/LibremappingUML.dia b/docs/LibremappingUML.dia
similarity index 100%
rename from src/mapmap/docs/LibremappingUML.dia
rename to docs/LibremappingUML.dia
diff --git a/src/mapmap/docs/datasheet.rst b/docs/datasheet.rst
similarity index 100%
rename from src/mapmap/docs/datasheet.rst
rename to docs/datasheet.rst
diff --git a/src/mapmap/docs/documentation.qrc b/docs/documentation.qrc
similarity index 100%
rename from src/mapmap/docs/documentation.qrc
rename to docs/documentation.qrc
diff --git a/index.dox b/docs/index.dox
similarity index 100%
rename from index.dox
rename to docs/index.dox
diff --git a/src/mapmap/docs/informations/CHANGELOG.html b/docs/informations/CHANGELOG.html
similarity index 100%
rename from src/mapmap/docs/informations/CHANGELOG.html
rename to docs/informations/CHANGELOG.html
diff --git a/src/mapmap/docs/informations/CONTRIBUTORS.html b/docs/informations/CONTRIBUTORS.html
similarity index 100%
rename from src/mapmap/docs/informations/CONTRIBUTORS.html
rename to docs/informations/CONTRIBUTORS.html
diff --git a/src/mapmap/docs/informations/CONTRIBUTORS.md b/docs/informations/CONTRIBUTORS.md
similarity index 100%
rename from src/mapmap/docs/informations/CONTRIBUTORS.md
rename to docs/informations/CONTRIBUTORS.md
diff --git a/src/mapmap/docs/informations/LICENSE b/docs/informations/LICENSE
similarity index 100%
rename from src/mapmap/docs/informations/LICENSE
rename to docs/informations/LICENSE
diff --git a/src/mapmap/docs/informations/LICENSE_SHORT.txt b/docs/informations/LICENSE_SHORT.txt
similarity index 100%
rename from src/mapmap/docs/informations/LICENSE_SHORT.txt
rename to docs/informations/LICENSE_SHORT.txt
diff --git a/src/mapmap/docs/informations/MAPPING b/docs/informations/MAPPING
similarity index 100%
rename from src/mapmap/docs/informations/MAPPING
rename to docs/informations/MAPPING
diff --git a/src/mapmap/docs/informations/osc.html b/docs/informations/osc.html
similarity index 100%
rename from src/mapmap/docs/informations/osc.html
rename to docs/informations/osc.html
diff --git a/src/mapmap/docs/informations/osc.md b/docs/informations/osc.md
similarity index 100%
rename from src/mapmap/docs/informations/osc.md
rename to docs/informations/osc.md
diff --git a/manual/manual_en.rst b/docs/manual/manual_en.rst
similarity index 100%
rename from manual/manual_en.rst
rename to docs/manual/manual_en.rst
diff --git a/src/mapmap/mapmap.pro b/mapmap.pro
similarity index 54%
rename from src/mapmap/mapmap.pro
rename to mapmap.pro
index 25cc4f0..f25797a 100644
--- a/src/mapmap/mapmap.pro
+++ b/mapmap.pro
@@ -1,105 +1,16 @@
-CONFIG  += qt debug c++11
-TEMPLATE = app
+CONFIG += c++11
+
 # Always use major.minor.micro version number format
 VERSION = 0.5.1
 TARGET = mapmap
-QT += gui opengl xml core network
-greaterThan(QT_MAJOR_VERSION, 4) {
-  QT -= gui # using widgets instead gui in Qt5
-  QT += widgets multimedia
-}
+
 DEFINES += UNICODE QT_THREAD_SUPPORT QT_CORE_LIB QT_GUI_LIB
 
-HEADERS  = \
-    AboutDialog.h \
-    Commands.h \
-    ConcurrentQueue.h \
-    ConsoleWindow.h \
-    Element.h \
-    Ellipse.h \
-    MM.h \
-    MainApplication.h \
-    MainWindow.h \
-    MappingGui.h \
-    MappingItemDelegate.h \
-    MappingListModel.h \
-    MapperGLCanvas.h \
-    MapperGLCanvasToolbar.h \
-    Mapping.h \
-    MappingManager.h \
-    Maths.h \
-    Mesh.h \
-    MetaObjectRegistry.h \
-    OscInterface.h \
-    OscReceiver.h \
-    OutputGLCanvas.h \
-    OutputGLWindow.h \
-    Paint.h \
-    PaintGui.h \
-    Polygon.h \
-    PreferenceDialog.h \
-    ProjectLabels.h \
-    ProjectReader.h \
-    ProjectWriter.h \
-    Quad.h \
-    Serializable.h \
-    Shape.h \
-    Shapes.h \
-    ShapeControlPainter.h \
-    ShapeGraphicsItem.h \
-    Triangle.h \
-    UidAllocator.h \
-    Util.h \
-    VideoImpl.h \
-    VideoUriDecodeBinImpl.h \
-    VideoV4l2SrcImpl.h \
-    VideoShmSrcImpl.h \
-    GuiForward.h
-
-SOURCES  = \
-    AboutDialog.cpp \
-    Commands.cpp \
-    ConsoleWindow.cpp \
-    Element.cpp \
-    Ellipse.cpp \
-    MM.cpp \
-    MainApplication.cpp \
-    MainWindow.cpp \
-    MappingGui.cpp \
-    MappingItemDelegate.cpp \
-    MappingListModel.cpp \
-    MapperGLCanvas.cpp \
-    MapperGLCanvasToolbar.cpp \
-    Mapping.cpp \
-    MappingManager.cpp \
-    Mesh.cpp \
-    MetaObjectRegistry.cpp \
-    OscInterface.cpp \
-    OscReceiver.cpp \
-    OutputGLCanvas.cpp \
-    OutputGLWindow.cpp \
-    Paint.cpp \
-    PaintGui.cpp \
-    Polygon.cpp \
-    PreferenceDialog.cpp \
-    ProjectLabels.cpp \
-    ProjectReader.cpp \
-    ProjectWriter.cpp \
-    Serializable.cpp \
-    Shape.cpp \
-    ShapeControlPainter.cpp \
-    ShapeGraphicsItem.cpp \
-    UidAllocator.cpp \
-    Util.cpp \
-    VideoImpl.cpp \
-    VideoUriDecodeBinImpl.cpp \
-    VideoV4l2SrcImpl.cpp \
-    VideoShmSrcImpl.cpp \
-    main.cpp
-
-# FIXME: that file doesn't exist
-include(contrib/qtpropertybrowser/src/qtpropertybrowser.pri)
-include(contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri)
+include(src/core/core.pri)
+include(src/shape/shape.pri)
+include(src/gui/gui.pri)
+include(src/control/control.pri)
+include(src/app/app.pri)
 
 TRANSLATIONS = \
     translations/mapmap_en.ts \
@@ -107,7 +18,7 @@ TRANSLATIONS = \
 RESOURCES = \
     translations/translation.qrc \
     docs/documentation.qrc \
-    interface.qrc
+    resources/interface.qrc
 
 # Manage lrelease (for translations)
 isEmpty(QMAKE_LRELEASE) {
@@ -122,24 +33,13 @@ QMAKE_EXTRA_COMPILERS += updateqm
 PRE_TARGETDEPS += compiler_updateqm_make_all
 system($$QMAKE_LRELEASE mapmap.pro) # Run lrelease
 
-# Add the docs target:
-docs.depends = $(HEADERS) $(SOURCES)
-docs.commands = (cat Doxyfile; echo "INPUT = $?") | doxygen -
-QMAKE_EXTRA_TARGETS += docs
+## Add the docs target:
+#docs.depends = $(HEADERS) $(SOURCES)
+#docs.commands = (cat Doxyfile; echo "INPUT = $?") | doxygen -
+#QMAKE_EXTRA_TARGETS += docs
 
-# Linux-specific:
+ Linux-specific:
 unix:!macx {
-  DEFINES += UNIX
-  CONFIG += link_pkgconfig
-  INCLUDE_PATH +=
-  PKGCONFIG += \
-    gstreamer-1.0 gstreamer-base-1.0 gstreamer-app-1.0 gstreamer-pbutils-1.0 \
-    liblo \
-    gl x11
-  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-result -Wno-unused-parameter \
-                            -Wno-unused-variable -Wno-switch -Wno-comment \
-                            -Wno-unused-but-set-variable
-  QMAKE_CXXFLAGS += -DHAVE_OSC
   mapmapfile.files = mapmap
   mapmapfile.path = /usr/bin
   INSTALLS += mapmapfile
@@ -207,22 +107,22 @@ win32 {
   }
   #  DESTDIR = ../../Mapmap # Just for packaging
 
-  INCLUDEPATH += $${GST_HOME}/lib/gstreamer-1.0/include \
-    $${GST_HOME}/include/glib-2.0 \
-    $${GST_HOME}/lib/glib-2.0/include \
-    $${GST_HOME}/include/gstreamer-1.0
+#  INCLUDEPATH += $${GST_HOME}/lib/gstreamer-1.0/include \
+#    $${GST_HOME}/include/glib-2.0 \
+#    $${GST_HOME}/lib/glib-2.0/include \
+#    $${GST_HOME}/include/gstreamer-1.0
 
-  LIBS += $${GST_HOME}/lib/gstapp-1.0.lib \
-    $${GST_HOME}/lib/gstbase-1.0.lib \
-    $${GST_HOME}/lib/gstpbutils-1.0.lib \
-    $${GST_HOME}/lib/gstreamer-1.0.lib \
-    $${GST_HOME}/lib/gobject-2.0.lib \
-    $${GST_HOME}/lib/glib-2.0.lib \
-    -lopengl32
+#  LIBS += $${GST_HOME}/lib/gstapp-1.0.lib \
+#    $${GST_HOME}/lib/gstbase-1.0.lib \
+#    $${GST_HOME}/lib/gstpbutils-1.0.lib \
+#    $${GST_HOME}/lib/gstreamer-1.0.lib \
+#    $${GST_HOME}/lib/gobject-2.0.lib \
+#    $${GST_HOME}/lib/glib-2.0.lib \
+#    -lopengl32
 
   CONFIG += release
 
-  RC_FILE = mapmap_resource.rc
+  RC_FILE = resources/windows_resource.rc
   QMAKE_CXXFLAGS += -D_USE_MATH_DEFINES
 }
 
diff --git a/src/mapmap/resources/fonts/DroidSans.otf b/resources/fonts/DroidSans.otf
similarity index 100%
rename from src/mapmap/resources/fonts/DroidSans.otf
rename to resources/fonts/DroidSans.otf
diff --git a/src/mapmap/resources/fonts/Hack-Regular.otf b/resources/fonts/Hack-Regular.otf
similarity index 100%
rename from src/mapmap/resources/fonts/Hack-Regular.otf
rename to resources/fonts/Hack-Regular.otf
diff --git a/src/mapmap/resources/images/icons/add_circ.png b/resources/images/icons/add_circ.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_circ.png
rename to resources/images/icons/add_circ.png
diff --git a/src/mapmap/resources/images/icons/add_circ2.png b/resources/images/icons/add_circ2.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_circ2.png
rename to resources/images/icons/add_circ2.png
diff --git a/src/mapmap/resources/images/icons/add_circ_w.png b/resources/images/icons/add_circ_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_circ_w.png
rename to resources/images/icons/add_circ_w.png
diff --git a/src/mapmap/resources/images/icons/add_color.png b/resources/images/icons/add_color.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_color.png
rename to resources/images/icons/add_color.png
diff --git a/src/mapmap/resources/images/icons/add_color2_w.png b/resources/images/icons/add_color2_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_color2_w.png
rename to resources/images/icons/add_color2_w.png
diff --git a/src/mapmap/resources/images/icons/add_color3.png b/resources/images/icons/add_color3.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_color3.png
rename to resources/images/icons/add_color3.png
diff --git a/src/mapmap/resources/images/icons/add_color3_sof_w.png b/resources/images/icons/add_color3_sof_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_color3_sof_w.png
rename to resources/images/icons/add_color3_sof_w.png
diff --git a/src/mapmap/resources/images/icons/add_color3_w.png b/resources/images/icons/add_color3_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_color3_w.png
rename to resources/images/icons/add_color3_w.png
diff --git a/src/mapmap/resources/images/icons/add_color_w.png b/resources/images/icons/add_color_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_color_w.png
rename to resources/images/icons/add_color_w.png
diff --git a/src/mapmap/resources/images/icons/add_img.png b/resources/images/icons/add_img.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_img.png
rename to resources/images/icons/add_img.png
diff --git a/src/mapmap/resources/images/icons/add_img_w.png b/resources/images/icons/add_img_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_img_w.png
rename to resources/images/icons/add_img_w.png
diff --git a/src/mapmap/resources/images/icons/add_movie.png b/resources/images/icons/add_movie.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_movie.png
rename to resources/images/icons/add_movie.png
diff --git a/src/mapmap/resources/images/icons/add_movie_w.png b/resources/images/icons/add_movie_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_movie_w.png
rename to resources/images/icons/add_movie_w.png
diff --git a/src/mapmap/resources/images/icons/add_paint.png b/resources/images/icons/add_paint.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_paint.png
rename to resources/images/icons/add_paint.png
diff --git a/src/mapmap/resources/images/icons/add_paint_w.png b/resources/images/icons/add_paint_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_paint_w.png
rename to resources/images/icons/add_paint_w.png
diff --git a/src/mapmap/resources/images/icons/add_quad.png b/resources/images/icons/add_quad.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_quad.png
rename to resources/images/icons/add_quad.png
diff --git a/src/mapmap/resources/images/icons/add_quad2.png b/resources/images/icons/add_quad2.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_quad2.png
rename to resources/images/icons/add_quad2.png
diff --git a/src/mapmap/resources/images/icons/add_quad_w.png b/resources/images/icons/add_quad_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_quad_w.png
rename to resources/images/icons/add_quad_w.png
diff --git a/src/mapmap/resources/images/icons/add_tri.png b/resources/images/icons/add_tri.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_tri.png
rename to resources/images/icons/add_tri.png
diff --git a/src/mapmap/resources/images/icons/add_tri_2.png b/resources/images/icons/add_tri_2.png
similarity index 100%
rename from src/mapmap/resources/images/icons/add_tri_2.png
rename to resources/images/icons/add_tri_2.png
diff --git a/src/mapmap/resources/images/icons/color.png b/resources/images/icons/color.png
similarity index 100%
rename from src/mapmap/resources/images/icons/color.png
rename to resources/images/icons/color.png
diff --git a/src/mapmap/resources/images/icons/color2.png b/resources/images/icons/color2.png
similarity index 100%
rename from src/mapmap/resources/images/icons/color2.png
rename to resources/images/icons/color2.png
diff --git a/src/mapmap/resources/images/icons/color2_w.png b/resources/images/icons/color2_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/color2_w.png
rename to resources/images/icons/color2_w.png
diff --git a/src/mapmap/resources/images/icons/color3.png b/resources/images/icons/color3.png
similarity index 100%
rename from src/mapmap/resources/images/icons/color3.png
rename to resources/images/icons/color3.png
diff --git a/src/mapmap/resources/images/icons/color3_w.png b/resources/images/icons/color3_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/color3_w.png
rename to resources/images/icons/color3_w.png
diff --git a/src/mapmap/resources/images/icons/color_p.png b/resources/images/icons/color_p.png
similarity index 100%
rename from src/mapmap/resources/images/icons/color_p.png
rename to resources/images/icons/color_p.png
diff --git a/src/mapmap/resources/images/icons/ctrl.png b/resources/images/icons/ctrl.png
similarity index 100%
rename from src/mapmap/resources/images/icons/ctrl.png
rename to resources/images/icons/ctrl.png
diff --git a/src/mapmap/resources/images/icons/ctrl2.png b/resources/images/icons/ctrl2.png
similarity index 100%
rename from src/mapmap/resources/images/icons/ctrl2.png
rename to resources/images/icons/ctrl2.png
diff --git a/src/mapmap/resources/images/icons/ctrl2_w.png b/resources/images/icons/ctrl2_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/ctrl2_w.png
rename to resources/images/icons/ctrl2_w.png
diff --git a/src/mapmap/resources/images/icons/ctrl3_w.png b/resources/images/icons/ctrl3_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/ctrl3_w.png
rename to resources/images/icons/ctrl3_w.png
diff --git a/src/mapmap/resources/images/icons/ctrl_w.png b/resources/images/icons/ctrl_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/ctrl_w.png
rename to resources/images/icons/ctrl_w.png
diff --git a/src/mapmap/resources/images/icons/fullscreen.png b/resources/images/icons/fullscreen.png
similarity index 100%
rename from src/mapmap/resources/images/icons/fullscreen.png
rename to resources/images/icons/fullscreen.png
diff --git a/src/mapmap/resources/images/icons/fullscreen2.png b/resources/images/icons/fullscreen2.png
similarity index 100%
rename from src/mapmap/resources/images/icons/fullscreen2.png
rename to resources/images/icons/fullscreen2.png
diff --git a/src/mapmap/resources/images/icons/fullscreen3_w.png b/resources/images/icons/fullscreen3_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/fullscreen3_w.png
rename to resources/images/icons/fullscreen3_w.png
diff --git a/src/mapmap/resources/images/icons/fullscreen_w.png b/resources/images/icons/fullscreen_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/fullscreen_w.png
rename to resources/images/icons/fullscreen_w.png
diff --git a/src/mapmap/resources/images/icons/grille.png b/resources/images/icons/grille.png
similarity index 100%
rename from src/mapmap/resources/images/icons/grille.png
rename to resources/images/icons/grille.png
diff --git a/src/mapmap/resources/images/icons/grille_w.png b/resources/images/icons/grille_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/grille_w.png
rename to resources/images/icons/grille_w.png
diff --git a/src/mapmap/resources/images/icons/newdoc.png b/resources/images/icons/newdoc.png
similarity index 100%
rename from src/mapmap/resources/images/icons/newdoc.png
rename to resources/images/icons/newdoc.png
diff --git a/src/mapmap/resources/images/icons/newdoc_w.png b/resources/images/icons/newdoc_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/newdoc_w.png
rename to resources/images/icons/newdoc_w.png
diff --git a/src/mapmap/resources/images/icons/nofullscreen.png b/resources/images/icons/nofullscreen.png
similarity index 100%
rename from src/mapmap/resources/images/icons/nofullscreen.png
rename to resources/images/icons/nofullscreen.png
diff --git a/src/mapmap/resources/images/icons/nofullscreen_w.png b/resources/images/icons/nofullscreen_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/nofullscreen_w.png
rename to resources/images/icons/nofullscreen_w.png
diff --git a/src/mapmap/resources/images/icons/open.png b/resources/images/icons/open.png
similarity index 100%
rename from src/mapmap/resources/images/icons/open.png
rename to resources/images/icons/open.png
diff --git a/src/mapmap/resources/images/icons/open_w.png b/resources/images/icons/open_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/open_w.png
rename to resources/images/icons/open_w.png
diff --git a/src/mapmap/resources/images/icons/pause.png b/resources/images/icons/pause.png
similarity index 100%
rename from src/mapmap/resources/images/icons/pause.png
rename to resources/images/icons/pause.png
diff --git a/src/mapmap/resources/images/icons/pause_w.png b/resources/images/icons/pause_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/pause_w.png
rename to resources/images/icons/pause_w.png
diff --git a/src/mapmap/resources/images/icons/pause_w2.png b/resources/images/icons/pause_w2.png
similarity index 100%
rename from src/mapmap/resources/images/icons/pause_w2.png
rename to resources/images/icons/pause_w2.png
diff --git a/src/mapmap/resources/images/icons/play.png b/resources/images/icons/play.png
similarity index 100%
rename from src/mapmap/resources/images/icons/play.png
rename to resources/images/icons/play.png
diff --git a/src/mapmap/resources/images/icons/play_w.png b/resources/images/icons/play_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/play_w.png
rename to resources/images/icons/play_w.png
diff --git a/src/mapmap/resources/images/icons/rewind.png b/resources/images/icons/rewind.png
similarity index 100%
rename from src/mapmap/resources/images/icons/rewind.png
rename to resources/images/icons/rewind.png
diff --git a/src/mapmap/resources/images/icons/rewind_w.png b/resources/images/icons/rewind_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/rewind_w.png
rename to resources/images/icons/rewind_w.png
diff --git a/src/mapmap/resources/images/icons/save.png b/resources/images/icons/save.png
similarity index 100%
rename from src/mapmap/resources/images/icons/save.png
rename to resources/images/icons/save.png
diff --git a/src/mapmap/resources/images/icons/save_w.png b/resources/images/icons/save_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/save_w.png
rename to resources/images/icons/save_w.png
diff --git a/src/mapmap/resources/images/icons/small/delete.png b/resources/images/icons/small/delete.png
similarity index 100%
rename from src/mapmap/resources/images/icons/small/delete.png
rename to resources/images/icons/small/delete.png
diff --git a/src/mapmap/resources/images/icons/small/delete_w.png b/resources/images/icons/small/delete_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/small/delete_w.png
rename to resources/images/icons/small/delete_w.png
diff --git a/src/mapmap/resources/images/icons/small/duplicate.png b/resources/images/icons/small/duplicate.png
similarity index 100%
rename from src/mapmap/resources/images/icons/small/duplicate.png
rename to resources/images/icons/small/duplicate.png
diff --git a/src/mapmap/resources/images/icons/small/duplicate_w.png b/resources/images/icons/small/duplicate_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/small/duplicate_w.png
rename to resources/images/icons/small/duplicate_w.png
diff --git a/src/mapmap/resources/images/icons/small/lock.png b/resources/images/icons/small/lock.png
similarity index 100%
rename from src/mapmap/resources/images/icons/small/lock.png
rename to resources/images/icons/small/lock.png
diff --git a/src/mapmap/resources/images/icons/small/lock_w.png b/resources/images/icons/small/lock_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/small/lock_w.png
rename to resources/images/icons/small/lock_w.png
diff --git a/src/mapmap/resources/images/icons/small/solo.png b/resources/images/icons/small/solo.png
similarity index 100%
rename from src/mapmap/resources/images/icons/small/solo.png
rename to resources/images/icons/small/solo.png
diff --git a/src/mapmap/resources/images/icons/small/solo_w.png b/resources/images/icons/small/solo_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/small/solo_w.png
rename to resources/images/icons/small/solo_w.png
diff --git a/src/mapmap/resources/images/icons/small/visible.png b/resources/images/icons/small/visible.png
similarity index 100%
rename from src/mapmap/resources/images/icons/small/visible.png
rename to resources/images/icons/small/visible.png
diff --git a/src/mapmap/resources/images/icons/small/visible_w.png b/resources/images/icons/small/visible_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/small/visible_w.png
rename to resources/images/icons/small/visible_w.png
diff --git a/src/mapmap/resources/images/icons/test_signal_w.png b/resources/images/icons/test_signal_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/test_signal_w.png
rename to resources/images/icons/test_signal_w.png
diff --git a/src/mapmap/resources/images/icons/zoom_fit.png b/resources/images/icons/zoom_fit.png
similarity index 100%
rename from src/mapmap/resources/images/icons/zoom_fit.png
rename to resources/images/icons/zoom_fit.png
diff --git a/src/mapmap/resources/images/icons/zoom_fit_w.png b/resources/images/icons/zoom_fit_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/zoom_fit_w.png
rename to resources/images/icons/zoom_fit_w.png
diff --git a/src/mapmap/resources/images/icons/zoom_in.png b/resources/images/icons/zoom_in.png
similarity index 100%
rename from src/mapmap/resources/images/icons/zoom_in.png
rename to resources/images/icons/zoom_in.png
diff --git a/src/mapmap/resources/images/icons/zoom_in_w.png b/resources/images/icons/zoom_in_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/zoom_in_w.png
rename to resources/images/icons/zoom_in_w.png
diff --git a/src/mapmap/resources/images/icons/zoom_out.png b/resources/images/icons/zoom_out.png
similarity index 100%
rename from src/mapmap/resources/images/icons/zoom_out.png
rename to resources/images/icons/zoom_out.png
diff --git a/src/mapmap/resources/images/icons/zoom_out_w.png b/resources/images/icons/zoom_out_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/zoom_out_w.png
rename to resources/images/icons/zoom_out_w.png
diff --git a/src/mapmap/resources/images/icons/zoom_reset.png b/resources/images/icons/zoom_reset.png
similarity index 100%
rename from src/mapmap/resources/images/icons/zoom_reset.png
rename to resources/images/icons/zoom_reset.png
diff --git a/src/mapmap/resources/images/icons/zoom_reset_w.png b/resources/images/icons/zoom_reset_w.png
similarity index 100%
rename from src/mapmap/resources/images/icons/zoom_reset_w.png
rename to resources/images/icons/zoom_reset_w.png
diff --git a/src/mapmap/resources/images/logo/mapmap-logo.ico b/resources/images/logo/mapmap-logo.ico
similarity index 100%
rename from src/mapmap/resources/images/logo/mapmap-logo.ico
rename to resources/images/logo/mapmap-logo.ico
diff --git a/src/mapmap/resources/images/logo/mapmap.ico b/resources/images/logo/mapmap.ico
similarity index 100%
rename from src/mapmap/resources/images/logo/mapmap.ico
rename to resources/images/logo/mapmap.ico
diff --git a/resources/interface.qrc b/resources/interface.qrc
new file mode 100644
index 0000000..1bd5a4e
--- /dev/null
+++ b/resources/interface.qrc
@@ -0,0 +1,51 @@
+<RCC>
+    <qresource prefix="/">
+        <file alias="new">images/icons/newdoc_w.png</file>
+        <file alias="open">images/icons/open_w.png</file>
+        <file alias="save">images/icons/save_w.png</file>
+        <file alias="save-as">images/icons/save_w.png</file>
+        <file alias="fullscreen">images/icons/fullscreen_w.png</file>
+        <file alias="output-window">images/icons/nofullscreen_w.png</file>
+        <file alias="control-points">images/icons/ctrl2_w.png</file>
+        <file alias="toggle-test-signal">images/icons/test_signal_w.png</file>
+        <file alias="add-video">images/icons/add_movie_w.png</file>
+        <file alias="add-image">images/icons/add_img_w.png</file>
+        <file alias="add-color">images/icons/add_paint_w.png</file>
+        <file alias="add-mesh">images/shapes/add_quad.png</file>
+        <file alias="add-triangle">images/shapes/add_triangle.png</file>
+        <file alias="add-ellipse">images/shapes/add_circle.png</file>
+        <file alias="play">images/icons/play_w.png</file>
+        <file alias="pause">images/icons/pause_w.png</file>
+        <file alias="rewind">images/icons/rewind_w.png</file>
+        <file alias="shape-mesh">images/shapes/add_quad.png</file>
+        <file alias="shape-triangle">images/shapes/add_triangle.png</file>
+        <file alias="shape-ellipse">images/shapes/add_circle.png</file>
+        <file alias="shape-polygon">images/shapes/add_circle.png</file>
+        <file alias="mapmap-title">images/logo/logomapmap.png</file>
+        <file alias="mapmap-title-light">images/logo/logomapmap-light.png</file>
+        <file alias="mapmap-logo">images/logo/mapmap-logo.png</file>
+        <file alias="mapmap-splash">images/logo/splash.png</file>
+        <file alias="logo-title">fonts/DroidSans.otf</file>
+        <file alias="base-font">fonts/DroidSans.otf</file>
+        <file alias="test-signal">images/test-signal/test-signal.svg</file>
+        <file alias="reset-zoom">images/icons/zoom_reset_w.png</file>
+        <file alias="zoom-in">images/icons/zoom_in_w.png</file>
+        <file alias="zoom-out">images/icons/zoom_out_w.png</file>
+        <file alias="zoom-fit">images/icons/zoom_fit_w.png</file>
+        <file alias="delete-mapping">images/icons/small/delete_w.png</file>
+        <file alias="lock-mapping">images/icons/small/lock_w.png</file>
+        <file alias="visible-mapping">images/icons/small/visible_w.png</file>
+        <file alias="duplicate-mapping">images/icons/small/duplicate_w.png</file>
+        <file alias="solo-mapping">images/icons/small/solo.png</file>
+        <file alias="stylesheet">qss/mapmap.qss</file>
+        <file alias="console-font">fonts/Hack-Regular.otf</file>
+        <file alias="preferences">images/menu/preferences.png</file>
+        <file alias="pal-test-card">images/test-signal/pal-test-signal.svg</file>
+        <file alias="classic-test">images/test-signal/examples/classic-test-card.png</file>
+        <file alias="pal-test">images/test-signal/examples/pal-test-card.png</file>
+        <file alias="ntsc-test">images/test-signal/examples/ntsc-test-card.png</file>
+        <file>images/checkbox/checkbox-unchecked.png</file>
+        <file alias="ntsc-test-card">images/test-signal/ntsc-test-signal.svg</file>
+        <file alias="mapmap-logo-with-border">images/logo/mapmap-wide-with-border.svg</file>
+    </qresource>
+</RCC>
diff --git a/src/mapmap/interface.qrc b/resources/interface.qrc-bak
similarity index 100%
rename from src/mapmap/interface.qrc
rename to resources/interface.qrc-bak
diff --git a/src/mapmap/resources/qss/mapmap.qss b/resources/qss/mapmap.qss
similarity index 100%
rename from src/mapmap/resources/qss/mapmap.qss
rename to resources/qss/mapmap.qss
diff --git a/src/mapmap/resources/texts/mapmap.desktop b/resources/texts/mapmap.desktop
similarity index 100%
rename from src/mapmap/resources/texts/mapmap.desktop
rename to resources/texts/mapmap.desktop
diff --git a/src/mapmap/resources/texts/mapmap.xml b/resources/texts/mapmap.xml
similarity index 100%
rename from src/mapmap/resources/texts/mapmap.xml
rename to resources/texts/mapmap.xml
diff --git a/src/mapmap/mapmap_resource.rc b/resources/windows_resource.rc
similarity index 91%
rename from src/mapmap/mapmap_resource.rc
rename to resources/windows_resource.rc
index 27018c6..361116d 100644
--- a/src/mapmap/mapmap_resource.rc
+++ b/resources/windows_resource.rc
@@ -37,5 +37,5 @@ VS_VERSION_INFO VERSIONINFO
 	END
 /* End of Version info */
 
-IDI_ICON1               ICON    DISCARDABLE     "resources/images/logo/mapmap.ico"
+IDI_ICON1               ICON    DISCARDABLE     "images/logo/mapmap.ico"
 
diff --git a/build.sh b/scripts/build.sh
similarity index 100%
rename from build.sh
rename to scripts/build.sh
diff --git a/run.sh b/scripts/run.sh
similarity index 100%
rename from run.sh
rename to scripts/run.sh
diff --git a/sh_build_doc.sh b/scripts/sh_build_doc.sh
similarity index 100%
rename from sh_build_doc.sh
rename to scripts/sh_build_doc.sh
diff --git a/sh_clean.sh b/scripts/sh_clean.sh
similarity index 100%
rename from sh_clean.sh
rename to scripts/sh_clean.sh
diff --git a/sh_make_tarball.sh b/scripts/sh_make_tarball.sh
similarity index 100%
rename from sh_make_tarball.sh
rename to scripts/sh_make_tarball.sh
diff --git a/sh_release.sh b/scripts/sh_release.sh
similarity index 100%
rename from sh_release.sh
rename to scripts/sh_release.sh
diff --git a/sh_show_libs.sh b/scripts/sh_show_libs.sh
similarity index 100%
rename from sh_show_libs.sh
rename to scripts/sh_show_libs.sh
diff --git a/src/MapMapProject.pro b/src/MapMapProject.pro
deleted file mode 100644
index e541165..0000000
--- a/src/MapMapProject.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = subdirs
-
-SUBDIRS = mapmap tests
-
-# Adds the tarball target
-tarball.target = mapmap-$${VERSION}.tar.gz
-tarball.commands = git archive --format=tar.gz -9 --prefix=mapmap-$${VERSION}/ --output=mapmap-$${VERSION}.tar.gz HEAD
-tarball.depends = .git
-QMAKE_EXTRA_TARGETS += tarball
diff --git a/src/mapmap/MainApplication.cpp b/src/app/MainApplication.cpp
similarity index 100%
rename from src/mapmap/MainApplication.cpp
rename to src/app/MainApplication.cpp
diff --git a/src/mapmap/MainApplication.h b/src/app/MainApplication.h
similarity index 100%
rename from src/mapmap/MainApplication.h
rename to src/app/MainApplication.h
diff --git a/src/app/app.pri b/src/app/app.pri
new file mode 100644
index 0000000..40e6fb1
--- /dev/null
+++ b/src/app/app.pri
@@ -0,0 +1,11 @@
+
+include(../src.pri)
+
+HEADERS += $$PWD/MainApplication.h
+
+SOURCES += $$PWD/MainApplication.cpp \
+    $$PWD/main.cpp
+
+MOC_DIR = $$PWD/mocs
+OBJECTS_DIR = $$PWD/objs
+RCC_DIR = $$PWD/qrc
diff --git a/src/mapmap/main.cpp b/src/app/main.cpp
similarity index 100%
rename from src/mapmap/main.cpp
rename to src/app/main.cpp
diff --git a/src/mapmap/ConcurrentQueue.h b/src/control/ConcurrentQueue.h
similarity index 99%
rename from src/mapmap/ConcurrentQueue.h
rename to src/control/ConcurrentQueue.h
index 4d0a6e2..84a0594 100644
--- a/src/mapmap/ConcurrentQueue.h
+++ b/src/control/ConcurrentQueue.h
@@ -31,7 +31,6 @@
 #include <queue>
 #include <QMutex>
 #include <QWaitCondition>
-#include "MM.h"
 
 namespace mmp {
 
diff --git a/src/mapmap/OscInterface.cpp b/src/control/OscInterface.cpp
similarity index 100%
rename from src/mapmap/OscInterface.cpp
rename to src/control/OscInterface.cpp
diff --git a/src/mapmap/OscInterface.h b/src/control/OscInterface.h
similarity index 100%
rename from src/mapmap/OscInterface.h
rename to src/control/OscInterface.h
diff --git a/src/mapmap/OscReceiver.cpp b/src/control/OscReceiver.cpp
similarity index 100%
rename from src/mapmap/OscReceiver.cpp
rename to src/control/OscReceiver.cpp
diff --git a/src/mapmap/OscReceiver.h b/src/control/OscReceiver.h
similarity index 100%
rename from src/mapmap/OscReceiver.h
rename to src/control/OscReceiver.h
diff --git a/src/control/control.pri b/src/control/control.pri
new file mode 100644
index 0000000..80e6899
--- /dev/null
+++ b/src/control/control.pri
@@ -0,0 +1,9 @@
+
+include(../src.pri)
+
+HEADERS += $$PWD/ConcurrentQueue.h \
+    $$PWD/OscInterface.h \
+    $$PWD/OscReceiver.h
+
+SOURCES += $$PWD/OscInterface.cpp \
+    $$PWD/OscReceiver.cpp
diff --git a/src/mapmap/Commands.cpp b/src/core/Commands.cpp
similarity index 100%
rename from src/mapmap/Commands.cpp
rename to src/core/Commands.cpp
diff --git a/src/mapmap/Commands.h b/src/core/Commands.h
similarity index 100%
rename from src/mapmap/Commands.h
rename to src/core/Commands.h
diff --git a/src/mapmap/Element.cpp b/src/core/Element.cpp
similarity index 100%
rename from src/mapmap/Element.cpp
rename to src/core/Element.cpp
diff --git a/src/mapmap/Element.h b/src/core/Element.h
similarity index 100%
rename from src/mapmap/Element.h
rename to src/core/Element.h
diff --git a/src/mapmap/MM.cpp b/src/core/MM.cpp
similarity index 100%
rename from src/mapmap/MM.cpp
rename to src/core/MM.cpp
diff --git a/src/mapmap/MM.h b/src/core/MM.h
similarity index 100%
rename from src/mapmap/MM.h
rename to src/core/MM.h
diff --git a/src/mapmap/Mapping.cpp b/src/core/Mapping.cpp
similarity index 98%
rename from src/mapmap/Mapping.cpp
rename to src/core/Mapping.cpp
index 02e4583..a57b57e 100644
--- a/src/mapmap/Mapping.cpp
+++ b/src/core/Mapping.cpp
@@ -92,7 +92,7 @@ void Mapping::read(const QDomElement& obj)
 
   // Read paint.
   int paintId = obj.attribute("paintId").toInt();
-  setPaint(MainWindow::window()->getMappingManager().getPaintById(paintId));
+//  setPaint(MainWindow::window()->getMappingManager().getPaintById(paintId));
 
   // Read output shape.
   _readShape(obj, true);
diff --git a/src/mapmap/Mapping.h b/src/core/Mapping.h
similarity index 100%
rename from src/mapmap/Mapping.h
rename to src/core/Mapping.h
diff --git a/src/mapmap/MappingManager.cpp b/src/core/MappingManager.cpp
similarity index 100%
rename from src/mapmap/MappingManager.cpp
rename to src/core/MappingManager.cpp
diff --git a/src/mapmap/MappingManager.h b/src/core/MappingManager.h
similarity index 100%
rename from src/mapmap/MappingManager.h
rename to src/core/MappingManager.h
diff --git a/src/mapmap/Maths.h b/src/core/Maths.h
similarity index 100%
rename from src/mapmap/Maths.h
rename to src/core/Maths.h
diff --git a/src/mapmap/MetaObjectRegistry.cpp b/src/core/MetaObjectRegistry.cpp
similarity index 100%
rename from src/mapmap/MetaObjectRegistry.cpp
rename to src/core/MetaObjectRegistry.cpp
diff --git a/src/mapmap/MetaObjectRegistry.h b/src/core/MetaObjectRegistry.h
similarity index 100%
rename from src/mapmap/MetaObjectRegistry.h
rename to src/core/MetaObjectRegistry.h
diff --git a/src/mapmap/Paint.cpp b/src/core/Paint.cpp
similarity index 100%
rename from src/mapmap/Paint.cpp
rename to src/core/Paint.cpp
diff --git a/src/mapmap/Paint.h b/src/core/Paint.h
similarity index 100%
rename from src/mapmap/Paint.h
rename to src/core/Paint.h
diff --git a/src/mapmap/ProjectLabels.cpp b/src/core/ProjectLabels.cpp
similarity index 100%
rename from src/mapmap/ProjectLabels.cpp
rename to src/core/ProjectLabels.cpp
diff --git a/src/mapmap/ProjectLabels.h b/src/core/ProjectLabels.h
similarity index 100%
rename from src/mapmap/ProjectLabels.h
rename to src/core/ProjectLabels.h
diff --git a/src/mapmap/ProjectReader.cpp b/src/core/ProjectReader.cpp
similarity index 100%
rename from src/mapmap/ProjectReader.cpp
rename to src/core/ProjectReader.cpp
diff --git a/src/mapmap/ProjectReader.h b/src/core/ProjectReader.h
similarity index 100%
rename from src/mapmap/ProjectReader.h
rename to src/core/ProjectReader.h
diff --git a/src/mapmap/ProjectWriter.cpp b/src/core/ProjectWriter.cpp
similarity index 100%
rename from src/mapmap/ProjectWriter.cpp
rename to src/core/ProjectWriter.cpp
diff --git a/src/mapmap/ProjectWriter.h b/src/core/ProjectWriter.h
similarity index 100%
rename from src/mapmap/ProjectWriter.h
rename to src/core/ProjectWriter.h
diff --git a/src/mapmap/Serializable.cpp b/src/core/Serializable.cpp
similarity index 100%
rename from src/mapmap/Serializable.cpp
rename to src/core/Serializable.cpp
diff --git a/src/mapmap/Serializable.h b/src/core/Serializable.h
similarity index 100%
rename from src/mapmap/Serializable.h
rename to src/core/Serializable.h
diff --git a/src/mapmap/UidAllocator.cpp b/src/core/UidAllocator.cpp
similarity index 100%
rename from src/mapmap/UidAllocator.cpp
rename to src/core/UidAllocator.cpp
diff --git a/src/mapmap/UidAllocator.h b/src/core/UidAllocator.h
similarity index 100%
rename from src/mapmap/UidAllocator.h
rename to src/core/UidAllocator.h
diff --git a/src/mapmap/Util.cpp b/src/core/Util.cpp
similarity index 100%
rename from src/mapmap/Util.cpp
rename to src/core/Util.cpp
diff --git a/src/mapmap/Util.h b/src/core/Util.h
similarity index 100%
rename from src/mapmap/Util.h
rename to src/core/Util.h
diff --git a/src/mapmap/VideoImpl.cpp b/src/core/VideoImpl.cpp
similarity index 100%
rename from src/mapmap/VideoImpl.cpp
rename to src/core/VideoImpl.cpp
diff --git a/src/mapmap/VideoImpl.h b/src/core/VideoImpl.h
similarity index 100%
rename from src/mapmap/VideoImpl.h
rename to src/core/VideoImpl.h
diff --git a/src/mapmap/VideoShmSrcImpl.cpp b/src/core/VideoShmSrcImpl.cpp
similarity index 100%
rename from src/mapmap/VideoShmSrcImpl.cpp
rename to src/core/VideoShmSrcImpl.cpp
diff --git a/src/mapmap/VideoShmSrcImpl.h b/src/core/VideoShmSrcImpl.h
similarity index 100%
rename from src/mapmap/VideoShmSrcImpl.h
rename to src/core/VideoShmSrcImpl.h
diff --git a/src/mapmap/VideoUriDecodeBinImpl.cpp b/src/core/VideoUriDecodeBinImpl.cpp
similarity index 100%
rename from src/mapmap/VideoUriDecodeBinImpl.cpp
rename to src/core/VideoUriDecodeBinImpl.cpp
diff --git a/src/mapmap/VideoUriDecodeBinImpl.h b/src/core/VideoUriDecodeBinImpl.h
similarity index 100%
rename from src/mapmap/VideoUriDecodeBinImpl.h
rename to src/core/VideoUriDecodeBinImpl.h
diff --git a/src/mapmap/VideoV4l2SrcImpl.cpp b/src/core/VideoV4l2SrcImpl.cpp
similarity index 100%
rename from src/mapmap/VideoV4l2SrcImpl.cpp
rename to src/core/VideoV4l2SrcImpl.cpp
diff --git a/src/mapmap/VideoV4l2SrcImpl.h b/src/core/VideoV4l2SrcImpl.h
similarity index 100%
rename from src/mapmap/VideoV4l2SrcImpl.h
rename to src/core/VideoV4l2SrcImpl.h
diff --git a/src/core/core.pri b/src/core/core.pri
new file mode 100644
index 0000000..a8df44f
--- /dev/null
+++ b/src/core/core.pri
@@ -0,0 +1,39 @@
+
+include(../src.pri)
+
+HEADERS += $$PWD/Commands.h \
+    $$PWD/Element.h \
+    $$PWD/Mapping.h \
+    $$PWD/MappingManager.h \
+    $$PWD/Maths.h \
+    $$PWD/MetaObjectRegistry.h \
+    $$PWD/MM.h \
+    $$PWD/Paint.h \
+    $$PWD/ProjectLabels.h \
+    $$PWD/ProjectReader.h \
+    $$PWD/ProjectWriter.h \
+    $$PWD/Serializable.h \
+    $$PWD/UidAllocator.h \
+    $$PWD/VideoImpl.h \
+    $$PWD/VideoShmSrcImpl.h \
+    $$PWD/VideoUriDecodeBinImpl.h \
+    $$PWD/VideoV4l2SrcImpl.h \
+    $$PWD/Util.h
+
+SOURCES += $$PWD/Commands.cpp \
+    $$PWD/Element.cpp \
+    $$PWD/Mapping.cpp \
+    $$PWD/MappingManager.cpp \
+    $$PWD/MetaObjectRegistry.cpp \
+    $$PWD/MM.cpp \
+    $$PWD/Paint.cpp \
+    $$PWD/ProjectLabels.cpp \
+    $$PWD/ProjectReader.cpp \
+    $$PWD/ProjectWriter.cpp \
+    $$PWD/Serializable.cpp \
+    $$PWD/UidAllocator.cpp \
+    $$PWD/VideoImpl.cpp \
+    $$PWD/VideoShmSrcImpl.cpp \
+    $$PWD/VideoUriDecodeBinImpl.cpp \
+    $$PWD/VideoV4l2SrcImpl.cpp \
+    $$PWD/Util.cpp
diff --git a/src/mapmap/AboutDialog.cpp b/src/gui/AboutDialog.cpp
similarity index 100%
rename from src/mapmap/AboutDialog.cpp
rename to src/gui/AboutDialog.cpp
diff --git a/src/mapmap/AboutDialog.h b/src/gui/AboutDialog.h
similarity index 100%
rename from src/mapmap/AboutDialog.h
rename to src/gui/AboutDialog.h
diff --git a/src/mapmap/ConsoleWindow.cpp b/src/gui/ConsoleWindow.cpp
similarity index 100%
rename from src/mapmap/ConsoleWindow.cpp
rename to src/gui/ConsoleWindow.cpp
diff --git a/src/mapmap/ConsoleWindow.h b/src/gui/ConsoleWindow.h
similarity index 100%
rename from src/mapmap/ConsoleWindow.h
rename to src/gui/ConsoleWindow.h
diff --git a/src/mapmap/GuiForward.h b/src/gui/GuiForward.h
similarity index 100%
rename from src/mapmap/GuiForward.h
rename to src/gui/GuiForward.h
diff --git a/src/mapmap/MainWindow.cpp b/src/gui/MainWindow.cpp
similarity index 100%
rename from src/mapmap/MainWindow.cpp
rename to src/gui/MainWindow.cpp
diff --git a/src/mapmap/MainWindow.h b/src/gui/MainWindow.h
similarity index 100%
rename from src/mapmap/MainWindow.h
rename to src/gui/MainWindow.h
diff --git a/src/mapmap/MapperGLCanvas.cpp b/src/gui/MapperGLCanvas.cpp
similarity index 100%
rename from src/mapmap/MapperGLCanvas.cpp
rename to src/gui/MapperGLCanvas.cpp
diff --git a/src/mapmap/MapperGLCanvas.h b/src/gui/MapperGLCanvas.h
similarity index 100%
rename from src/mapmap/MapperGLCanvas.h
rename to src/gui/MapperGLCanvas.h
diff --git a/src/mapmap/MapperGLCanvasToolbar.cpp b/src/gui/MapperGLCanvasToolbar.cpp
similarity index 100%
rename from src/mapmap/MapperGLCanvasToolbar.cpp
rename to src/gui/MapperGLCanvasToolbar.cpp
diff --git a/src/mapmap/MapperGLCanvasToolbar.h b/src/gui/MapperGLCanvasToolbar.h
similarity index 100%
rename from src/mapmap/MapperGLCanvasToolbar.h
rename to src/gui/MapperGLCanvasToolbar.h
diff --git a/src/mapmap/MappingGui.cpp b/src/gui/MappingGui.cpp
similarity index 100%
rename from src/mapmap/MappingGui.cpp
rename to src/gui/MappingGui.cpp
diff --git a/src/mapmap/MappingGui.h b/src/gui/MappingGui.h
similarity index 100%
rename from src/mapmap/MappingGui.h
rename to src/gui/MappingGui.h
diff --git a/src/mapmap/MappingItemDelegate.cpp b/src/gui/MappingItemDelegate.cpp
similarity index 100%
rename from src/mapmap/MappingItemDelegate.cpp
rename to src/gui/MappingItemDelegate.cpp
diff --git a/src/mapmap/MappingItemDelegate.h b/src/gui/MappingItemDelegate.h
similarity index 100%
rename from src/mapmap/MappingItemDelegate.h
rename to src/gui/MappingItemDelegate.h
diff --git a/src/mapmap/MappingListModel.cpp b/src/gui/MappingListModel.cpp
similarity index 100%
rename from src/mapmap/MappingListModel.cpp
rename to src/gui/MappingListModel.cpp
diff --git a/src/mapmap/MappingListModel.h b/src/gui/MappingListModel.h
similarity index 100%
rename from src/mapmap/MappingListModel.h
rename to src/gui/MappingListModel.h
diff --git a/src/mapmap/OutputGLCanvas.cpp b/src/gui/OutputGLCanvas.cpp
similarity index 100%
rename from src/mapmap/OutputGLCanvas.cpp
rename to src/gui/OutputGLCanvas.cpp
diff --git a/src/mapmap/OutputGLCanvas.h b/src/gui/OutputGLCanvas.h
similarity index 100%
rename from src/mapmap/OutputGLCanvas.h
rename to src/gui/OutputGLCanvas.h
diff --git a/src/mapmap/OutputGLWindow.cpp b/src/gui/OutputGLWindow.cpp
similarity index 100%
rename from src/mapmap/OutputGLWindow.cpp
rename to src/gui/OutputGLWindow.cpp
diff --git a/src/mapmap/OutputGLWindow.h b/src/gui/OutputGLWindow.h
similarity index 100%
rename from src/mapmap/OutputGLWindow.h
rename to src/gui/OutputGLWindow.h
diff --git a/src/mapmap/PaintGui.cpp b/src/gui/PaintGui.cpp
similarity index 100%
rename from src/mapmap/PaintGui.cpp
rename to src/gui/PaintGui.cpp
diff --git a/src/mapmap/PaintGui.h b/src/gui/PaintGui.h
similarity index 100%
rename from src/mapmap/PaintGui.h
rename to src/gui/PaintGui.h
diff --git a/src/mapmap/PreferenceDialog.cpp b/src/gui/PreferenceDialog.cpp
similarity index 100%
rename from src/mapmap/PreferenceDialog.cpp
rename to src/gui/PreferenceDialog.cpp
diff --git a/src/mapmap/PreferenceDialog.h b/src/gui/PreferenceDialog.h
similarity index 100%
rename from src/mapmap/PreferenceDialog.h
rename to src/gui/PreferenceDialog.h
diff --git a/src/mapmap/ShapeControlPainter.cpp b/src/gui/ShapeControlPainter.cpp
similarity index 100%
rename from src/mapmap/ShapeControlPainter.cpp
rename to src/gui/ShapeControlPainter.cpp
diff --git a/src/mapmap/ShapeControlPainter.h b/src/gui/ShapeControlPainter.h
similarity index 100%
rename from src/mapmap/ShapeControlPainter.h
rename to src/gui/ShapeControlPainter.h
diff --git a/src/mapmap/ShapeGraphicsItem.cpp b/src/gui/ShapeGraphicsItem.cpp
similarity index 100%
rename from src/mapmap/ShapeGraphicsItem.cpp
rename to src/gui/ShapeGraphicsItem.cpp
diff --git a/src/mapmap/ShapeGraphicsItem.h b/src/gui/ShapeGraphicsItem.h
similarity index 100%
rename from src/mapmap/ShapeGraphicsItem.h
rename to src/gui/ShapeGraphicsItem.h
diff --git a/src/mapmap/contrib/qtpropertybrowser-extension/fileedit.cpp b/src/gui/contrib/qtpropertybrowser-extension/fileedit.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser-extension/fileedit.cpp
rename to src/gui/contrib/qtpropertybrowser-extension/fileedit.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser-extension/fileedit.h b/src/gui/contrib/qtpropertybrowser-extension/fileedit.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser-extension/fileedit.h
rename to src/gui/contrib/qtpropertybrowser-extension/fileedit.h
diff --git a/src/mapmap/contrib/qtpropertybrowser-extension/fileeditfactory.cpp b/src/gui/contrib/qtpropertybrowser-extension/fileeditfactory.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser-extension/fileeditfactory.cpp
rename to src/gui/contrib/qtpropertybrowser-extension/fileeditfactory.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser-extension/fileeditfactory.h b/src/gui/contrib/qtpropertybrowser-extension/fileeditfactory.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser-extension/fileeditfactory.h
rename to src/gui/contrib/qtpropertybrowser-extension/fileeditfactory.h
diff --git a/src/mapmap/contrib/qtpropertybrowser-extension/filepathmanager.cpp b/src/gui/contrib/qtpropertybrowser-extension/filepathmanager.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser-extension/filepathmanager.cpp
rename to src/gui/contrib/qtpropertybrowser-extension/filepathmanager.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser-extension/filepathmanager.h b/src/gui/contrib/qtpropertybrowser-extension/filepathmanager.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser-extension/filepathmanager.h
rename to src/gui/contrib/qtpropertybrowser-extension/filepathmanager.h
diff --git a/src/mapmap/contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri b/src/gui/contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri
rename to src/gui/contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri
diff --git a/src/mapmap/contrib/qtpropertybrowser-extension/variantfactory.cpp b/src/gui/contrib/qtpropertybrowser-extension/variantfactory.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser-extension/variantfactory.cpp
rename to src/gui/contrib/qtpropertybrowser-extension/variantfactory.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser-extension/variantfactory.h b/src/gui/contrib/qtpropertybrowser-extension/variantfactory.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser-extension/variantfactory.h
rename to src/gui/contrib/qtpropertybrowser-extension/variantfactory.h
diff --git a/src/mapmap/contrib/qtpropertybrowser-extension/variantmanager.cpp b/src/gui/contrib/qtpropertybrowser-extension/variantmanager.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser-extension/variantmanager.cpp
rename to src/gui/contrib/qtpropertybrowser-extension/variantmanager.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser-extension/variantmanager.h b/src/gui/contrib/qtpropertybrowser-extension/variantmanager.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser-extension/variantmanager.h
rename to src/gui/contrib/qtpropertybrowser-extension/variantmanager.h
diff --git a/src/mapmap/contrib/qtpropertybrowser/INSTALL.TXT b/src/gui/contrib/qtpropertybrowser/INSTALL.TXT
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/INSTALL.TXT
rename to src/gui/contrib/qtpropertybrowser/INSTALL.TXT
diff --git a/src/mapmap/contrib/qtpropertybrowser/README.TXT b/src/gui/contrib/qtpropertybrowser/README.TXT
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/README.TXT
rename to src/gui/contrib/qtpropertybrowser/README.TXT
diff --git a/src/mapmap/contrib/qtpropertybrowser/buildlib/buildlib.pro b/src/gui/contrib/qtpropertybrowser/buildlib/buildlib.pro
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/buildlib/buildlib.pro
rename to src/gui/contrib/qtpropertybrowser/buildlib/buildlib.pro
diff --git a/src/mapmap/contrib/qtpropertybrowser/common.pri b/src/gui/contrib/qtpropertybrowser/common.pri
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/common.pri
rename to src/gui/contrib/qtpropertybrowser/common.pri
diff --git a/src/mapmap/contrib/qtpropertybrowser/configure b/src/gui/contrib/qtpropertybrowser/configure
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/configure
rename to src/gui/contrib/qtpropertybrowser/configure
diff --git a/src/mapmap/contrib/qtpropertybrowser/configure.bat b/src/gui/contrib/qtpropertybrowser/configure.bat
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/configure.bat
rename to src/gui/contrib/qtpropertybrowser/configure.bat
diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/index.qdoc b/src/gui/contrib/qtpropertybrowser/doc/index.qdoc
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/doc/index.qdoc
rename to src/gui/contrib/qtpropertybrowser/doc/index.qdoc
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.pro b/src/gui/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.pro
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.pro
rename to src/gui/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.pro
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.qdoc b/src/gui/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.qdoc
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.qdoc
rename to src/gui/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.qdoc
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/main.cpp b/src/gui/contrib/qtpropertybrowser/examples/canvas_typed/main.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/main.cpp
rename to src/gui/contrib/qtpropertybrowser/examples/canvas_typed/main.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.cpp b/src/gui/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.cpp
rename to src/gui/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.h b/src/gui/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.h
rename to src/gui/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.h
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp b/src/gui/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp
rename to src/gui/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.h b/src/gui/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.h
rename to src/gui/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.h
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.pro b/src/gui/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.pro
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.pro
rename to src/gui/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.pro
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.qdoc b/src/gui/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.qdoc
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.qdoc
rename to src/gui/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.qdoc
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/main.cpp b/src/gui/contrib/qtpropertybrowser/examples/canvas_variant/main.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/main.cpp
rename to src/gui/contrib/qtpropertybrowser/examples/canvas_variant/main.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp b/src/gui/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp
rename to src/gui/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.h b/src/gui/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.h
rename to src/gui/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.h
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp b/src/gui/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp
rename to src/gui/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.h b/src/gui/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.h
rename to src/gui/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.h
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/decoration/decoration.pro b/src/gui/contrib/qtpropertybrowser/examples/decoration/decoration.pro
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/decoration/decoration.pro
rename to src/gui/contrib/qtpropertybrowser/examples/decoration/decoration.pro
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/decoration/decoration.qdoc b/src/gui/contrib/qtpropertybrowser/examples/decoration/decoration.qdoc
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/decoration/decoration.qdoc
rename to src/gui/contrib/qtpropertybrowser/examples/decoration/decoration.qdoc
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/decoration/main.cpp b/src/gui/contrib/qtpropertybrowser/examples/decoration/main.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/decoration/main.cpp
rename to src/gui/contrib/qtpropertybrowser/examples/decoration/main.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.pro b/src/gui/contrib/qtpropertybrowser/examples/demo/demo.pro
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.pro
rename to src/gui/contrib/qtpropertybrowser/examples/demo/demo.pro
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.qdoc b/src/gui/contrib/qtpropertybrowser/examples/demo/demo.qdoc
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.qdoc
rename to src/gui/contrib/qtpropertybrowser/examples/demo/demo.qdoc
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.qrc b/src/gui/contrib/qtpropertybrowser/examples/demo/demo.qrc
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.qrc
rename to src/gui/contrib/qtpropertybrowser/examples/demo/demo.qrc
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/demo/main.cpp b/src/gui/contrib/qtpropertybrowser/examples/demo/main.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/demo/main.cpp
rename to src/gui/contrib/qtpropertybrowser/examples/demo/main.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/examples.pro b/src/gui/contrib/qtpropertybrowser/examples/examples.pro
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/examples.pro
rename to src/gui/contrib/qtpropertybrowser/examples/examples.pro
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/extension/extension.pro b/src/gui/contrib/qtpropertybrowser/examples/extension/extension.pro
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/extension/extension.pro
rename to src/gui/contrib/qtpropertybrowser/examples/extension/extension.pro
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/extension/extension.qdoc b/src/gui/contrib/qtpropertybrowser/examples/extension/extension.qdoc
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/extension/extension.qdoc
rename to src/gui/contrib/qtpropertybrowser/examples/extension/extension.qdoc
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/extension/main.cpp b/src/gui/contrib/qtpropertybrowser/examples/extension/main.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/extension/main.cpp
rename to src/gui/contrib/qtpropertybrowser/examples/extension/main.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/object_controller/main.cpp b/src/gui/contrib/qtpropertybrowser/examples/object_controller/main.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/object_controller/main.cpp
rename to src/gui/contrib/qtpropertybrowser/examples/object_controller/main.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/object_controller/object_controller.pro b/src/gui/contrib/qtpropertybrowser/examples/object_controller/object_controller.pro
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/object_controller/object_controller.pro
rename to src/gui/contrib/qtpropertybrowser/examples/object_controller/object_controller.pro
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/object_controller/object_controller.qdoc b/src/gui/contrib/qtpropertybrowser/examples/object_controller/object_controller.qdoc
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/object_controller/object_controller.qdoc
rename to src/gui/contrib/qtpropertybrowser/examples/object_controller/object_controller.qdoc
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.cpp b/src/gui/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.cpp
rename to src/gui/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.h b/src/gui/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.h
rename to src/gui/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.h
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/simple/main.cpp b/src/gui/contrib/qtpropertybrowser/examples/simple/main.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/simple/main.cpp
rename to src/gui/contrib/qtpropertybrowser/examples/simple/main.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/simple/simple.pro b/src/gui/contrib/qtpropertybrowser/examples/simple/simple.pro
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/simple/simple.pro
rename to src/gui/contrib/qtpropertybrowser/examples/simple/simple.pro
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/simple/simple.qdoc b/src/gui/contrib/qtpropertybrowser/examples/simple/simple.qdoc
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/examples/simple/simple.qdoc
rename to src/gui/contrib/qtpropertybrowser/examples/simple/simple.qdoc
diff --git a/src/mapmap/contrib/qtpropertybrowser/qtpropertybrowser.pro b/src/gui/contrib/qtpropertybrowser/qtpropertybrowser.pro
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/qtpropertybrowser.pro
rename to src/gui/contrib/qtpropertybrowser/qtpropertybrowser.pro
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtAbstractEditorFactoryBase b/src/gui/contrib/qtpropertybrowser/src/QtAbstractEditorFactoryBase
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtAbstractEditorFactoryBase
rename to src/gui/contrib/qtpropertybrowser/src/QtAbstractEditorFactoryBase
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtAbstractPropertyBrowser b/src/gui/contrib/qtpropertybrowser/src/QtAbstractPropertyBrowser
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtAbstractPropertyBrowser
rename to src/gui/contrib/qtpropertybrowser/src/QtAbstractPropertyBrowser
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtAbstractPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtAbstractPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtAbstractPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtAbstractPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtBoolPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtBoolPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtBoolPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtBoolPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtBrowserItem b/src/gui/contrib/qtpropertybrowser/src/QtBrowserItem
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtBrowserItem
rename to src/gui/contrib/qtpropertybrowser/src/QtBrowserItem
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtButtonPropertyBrowser b/src/gui/contrib/qtpropertybrowser/src/QtButtonPropertyBrowser
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtButtonPropertyBrowser
rename to src/gui/contrib/qtpropertybrowser/src/QtButtonPropertyBrowser
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtCharEditorFactory b/src/gui/contrib/qtpropertybrowser/src/QtCharEditorFactory
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtCharEditorFactory
rename to src/gui/contrib/qtpropertybrowser/src/QtCharEditorFactory
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtCharPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtCharPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtCharPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtCharPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtCheckBoxFactory b/src/gui/contrib/qtpropertybrowser/src/QtCheckBoxFactory
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtCheckBoxFactory
rename to src/gui/contrib/qtpropertybrowser/src/QtCheckBoxFactory
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtColorEditorFactory b/src/gui/contrib/qtpropertybrowser/src/QtColorEditorFactory
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtColorEditorFactory
rename to src/gui/contrib/qtpropertybrowser/src/QtColorEditorFactory
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtColorPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtColorPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtColorPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtColorPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtCursorEditorFactory b/src/gui/contrib/qtpropertybrowser/src/QtCursorEditorFactory
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtCursorEditorFactory
rename to src/gui/contrib/qtpropertybrowser/src/QtCursorEditorFactory
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtCursorPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtCursorPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtCursorPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtCursorPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtDateEditFactory b/src/gui/contrib/qtpropertybrowser/src/QtDateEditFactory
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtDateEditFactory
rename to src/gui/contrib/qtpropertybrowser/src/QtDateEditFactory
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtDatePropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtDatePropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtDatePropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtDatePropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtDateTimeEditFactory b/src/gui/contrib/qtpropertybrowser/src/QtDateTimeEditFactory
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtDateTimeEditFactory
rename to src/gui/contrib/qtpropertybrowser/src/QtDateTimeEditFactory
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtDateTimePropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtDateTimePropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtDateTimePropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtDateTimePropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtDoublePropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtDoublePropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtDoublePropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtDoublePropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtDoubleSpinBoxFactory b/src/gui/contrib/qtpropertybrowser/src/QtDoubleSpinBoxFactory
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtDoubleSpinBoxFactory
rename to src/gui/contrib/qtpropertybrowser/src/QtDoubleSpinBoxFactory
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtEnumEditorFactory b/src/gui/contrib/qtpropertybrowser/src/QtEnumEditorFactory
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtEnumEditorFactory
rename to src/gui/contrib/qtpropertybrowser/src/QtEnumEditorFactory
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtEnumPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtEnumPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtEnumPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtEnumPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtFlagPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtFlagPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtFlagPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtFlagPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtFontEditorFactory b/src/gui/contrib/qtpropertybrowser/src/QtFontEditorFactory
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtFontEditorFactory
rename to src/gui/contrib/qtpropertybrowser/src/QtFontEditorFactory
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtFontPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtFontPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtFontPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtFontPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtGroupBoxPropertyBrowser b/src/gui/contrib/qtpropertybrowser/src/QtGroupBoxPropertyBrowser
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtGroupBoxPropertyBrowser
rename to src/gui/contrib/qtpropertybrowser/src/QtGroupBoxPropertyBrowser
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtGroupPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtGroupPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtGroupPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtGroupPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtIntPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtIntPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtIntPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtIntPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtKeySequenceEditorFactory b/src/gui/contrib/qtpropertybrowser/src/QtKeySequenceEditorFactory
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtKeySequenceEditorFactory
rename to src/gui/contrib/qtpropertybrowser/src/QtKeySequenceEditorFactory
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtKeySequencePropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtKeySequencePropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtKeySequencePropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtKeySequencePropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtLineEditFactory b/src/gui/contrib/qtpropertybrowser/src/QtLineEditFactory
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtLineEditFactory
rename to src/gui/contrib/qtpropertybrowser/src/QtLineEditFactory
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtLocalePropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtLocalePropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtLocalePropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtLocalePropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtPointFPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtPointFPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtPointFPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtPointFPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtPointPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtPointPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtPointPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtPointPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtProperty b/src/gui/contrib/qtpropertybrowser/src/QtProperty
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtProperty
rename to src/gui/contrib/qtpropertybrowser/src/QtProperty
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtRectFPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtRectFPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtRectFPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtRectFPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtRectPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtRectPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtRectPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtRectPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtScrollBarFactory b/src/gui/contrib/qtpropertybrowser/src/QtScrollBarFactory
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtScrollBarFactory
rename to src/gui/contrib/qtpropertybrowser/src/QtScrollBarFactory
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtSizeFPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtSizeFPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtSizeFPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtSizeFPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtSizePolicyPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtSizePolicyPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtSizePolicyPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtSizePolicyPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtSizePropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtSizePropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtSizePropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtSizePropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtSliderFactory b/src/gui/contrib/qtpropertybrowser/src/QtSliderFactory
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtSliderFactory
rename to src/gui/contrib/qtpropertybrowser/src/QtSliderFactory
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtSpinBoxFactory b/src/gui/contrib/qtpropertybrowser/src/QtSpinBoxFactory
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtSpinBoxFactory
rename to src/gui/contrib/qtpropertybrowser/src/QtSpinBoxFactory
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtStringPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtStringPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtStringPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtStringPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtTimeEditFactory b/src/gui/contrib/qtpropertybrowser/src/QtTimeEditFactory
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtTimeEditFactory
rename to src/gui/contrib/qtpropertybrowser/src/QtTimeEditFactory
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtTimePropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtTimePropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtTimePropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtTimePropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtTreePropertyBrowser b/src/gui/contrib/qtpropertybrowser/src/QtTreePropertyBrowser
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtTreePropertyBrowser
rename to src/gui/contrib/qtpropertybrowser/src/QtTreePropertyBrowser
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtVariantEditorFactory b/src/gui/contrib/qtpropertybrowser/src/QtVariantEditorFactory
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtVariantEditorFactory
rename to src/gui/contrib/qtpropertybrowser/src/QtVariantEditorFactory
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtVariantProperty b/src/gui/contrib/qtpropertybrowser/src/QtVariantProperty
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtVariantProperty
rename to src/gui/contrib/qtpropertybrowser/src/QtVariantProperty
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/QtVariantPropertyManager b/src/gui/contrib/qtpropertybrowser/src/QtVariantPropertyManager
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/QtVariantPropertyManager
rename to src/gui/contrib/qtpropertybrowser/src/QtVariantPropertyManager
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.cpp b/src/gui/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.cpp
rename to src/gui/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/src/gui/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.h
rename to src/gui/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.h
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qteditorfactory.cpp b/src/gui/contrib/qtpropertybrowser/src/qteditorfactory.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qteditorfactory.cpp
rename to src/gui/contrib/qtpropertybrowser/src/qteditorfactory.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qteditorfactory.h b/src/gui/contrib/qtpropertybrowser/src/qteditorfactory.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qteditorfactory.h
rename to src/gui/contrib/qtpropertybrowser/src/qteditorfactory.h
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.cpp b/src/gui/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.cpp
rename to src/gui/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.h b/src/gui/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.h
rename to src/gui/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.h
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.cpp b/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.cpp
rename to src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.h b/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.h
rename to src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.h
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.pri b/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.pri
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.pri
rename to src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.pri
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.qrc b/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.qrc
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.qrc
rename to src/gui/contrib/qtpropertybrowser/src/qtpropertybrowser.qrc
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp b/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp
rename to src/gui/contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowserutils_p.h b/src/gui/contrib/qtpropertybrowser/src/qtpropertybrowserutils_p.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowserutils_p.h
rename to src/gui/contrib/qtpropertybrowser/src/qtpropertybrowserutils_p.h
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qtpropertymanager.cpp b/src/gui/contrib/qtpropertybrowser/src/qtpropertymanager.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qtpropertymanager.cpp
rename to src/gui/contrib/qtpropertybrowser/src/qtpropertymanager.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qtpropertymanager.h b/src/gui/contrib/qtpropertybrowser/src/qtpropertymanager.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qtpropertymanager.h
rename to src/gui/contrib/qtpropertybrowser/src/qtpropertymanager.h
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qttreepropertybrowser.cpp b/src/gui/contrib/qtpropertybrowser/src/qttreepropertybrowser.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qttreepropertybrowser.cpp
rename to src/gui/contrib/qtpropertybrowser/src/qttreepropertybrowser.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qttreepropertybrowser.h b/src/gui/contrib/qtpropertybrowser/src/qttreepropertybrowser.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qttreepropertybrowser.h
rename to src/gui/contrib/qtpropertybrowser/src/qttreepropertybrowser.h
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qtvariantproperty.cpp b/src/gui/contrib/qtpropertybrowser/src/qtvariantproperty.cpp
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qtvariantproperty.cpp
rename to src/gui/contrib/qtpropertybrowser/src/qtvariantproperty.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/qtvariantproperty.h b/src/gui/contrib/qtpropertybrowser/src/qtvariantproperty.h
similarity index 100%
rename from src/mapmap/contrib/qtpropertybrowser/src/qtvariantproperty.h
rename to src/gui/contrib/qtpropertybrowser/src/qtvariantproperty.h
diff --git a/src/gui/gui.pri b/src/gui/gui.pri
new file mode 100644
index 0000000..742f1b8
--- /dev/null
+++ b/src/gui/gui.pri
@@ -0,0 +1,36 @@
+
+include(../src.pri)
+
+include(contrib/qtpropertybrowser/src/qtpropertybrowser.pri)
+include(contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri)
+
+HEADERS += $$PWD/AboutDialog.h \
+    $$PWD/ConsoleWindow.h \
+    $$PWD/GuiForward.h \
+    $$PWD/MainWindow.h \
+    $$PWD/MapperGLCanvas.h \
+    $$PWD/MapperGLCanvasToolbar.h \
+    $$PWD/MappingGui.h \
+    $$PWD/MappingItemDelegate.h \
+    $$PWD/MappingListModel.h \
+    $$PWD/OutputGLCanvas.h \
+    $$PWD/OutputGLWindow.h \
+    $$PWD/PaintGui.h \
+    $$PWD/PreferenceDialog.h \
+    $$PWD/ShapeControlPainter.h \
+    $$PWD/ShapeGraphicsItem.h
+
+SOURCES += $$PWD/AboutDialog.cpp \
+    $$PWD/ConsoleWindow.cpp \
+    $$PWD/MainWindow.cpp \
+    $$PWD/MapperGLCanvas.cpp \
+    $$PWD/MapperGLCanvasToolbar.cpp \
+    $$PWD/MappingGui.cpp \
+    $$PWD/MappingItemDelegate.cpp \
+    $$PWD/MappingListModel.cpp \
+    $$PWD/OutputGLCanvas.cpp \
+    $$PWD/OutputGLWindow.cpp \
+    $$PWD/PaintGui.cpp \
+    $$PWD/PreferenceDialog.cpp \
+    $$PWD/ShapeControlPainter.cpp \
+    $$PWD/ShapeGraphicsItem.cpp
diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/canvas_typed.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/canvas_typed.png
deleted file mode 100644
index 888cb6a..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/doc/images/canvas_typed.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/canvas_variant.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/canvas_variant.png
deleted file mode 100644
index 900ea8a..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/doc/images/canvas_variant.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/decoration.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/decoration.png
deleted file mode 100644
index 92db0fc..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/doc/images/decoration.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/demo.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/demo.png
deleted file mode 100644
index 767e77f..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/doc/images/demo.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/extension.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/extension.png
deleted file mode 100644
index e3e508d..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/doc/images/extension.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/object_controller.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/object_controller.png
deleted file mode 100644
index e490e6d..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/doc/images/object_controller.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/qt-logo.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qt-logo.png
deleted file mode 100644
index 794162f..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/doc/images/qt-logo.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/qtbuttonpropertybrowser.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qtbuttonpropertybrowser.png
deleted file mode 100644
index 7890fdb..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/doc/images/qtbuttonpropertybrowser.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/qtgroupboxpropertybrowser.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qtgroupboxpropertybrowser.png
deleted file mode 100644
index 203c50f..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/doc/images/qtgroupboxpropertybrowser.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/qtpropertybrowser-duplicate.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qtpropertybrowser-duplicate.png
deleted file mode 100644
index 0a939fc..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/doc/images/qtpropertybrowser-duplicate.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/qtpropertybrowser.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qtpropertybrowser.png
deleted file mode 100644
index 1f0403a..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/doc/images/qtpropertybrowser.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/qttreepropertybrowser.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qttreepropertybrowser.png
deleted file mode 100644
index 154c10d..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/doc/images/qttreepropertybrowser.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/doc/images/simple.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/simple.png
deleted file mode 100644
index 56048d5..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/doc/images/simple.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/down.png b/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/down.png
deleted file mode 100644
index 29d1d44..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/down.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/left.png b/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/left.png
deleted file mode 100644
index e58177f..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/left.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/right.png b/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/right.png
deleted file mode 100644
index 34b91f0..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/right.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/up.png b/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/up.png
deleted file mode 100644
index e437312..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/up.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-arrow.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-arrow.png
deleted file mode 100644
index a69ef4e..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-arrow.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-busy.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-busy.png
deleted file mode 100644
index 53717e4..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-busy.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-closedhand.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-closedhand.png
deleted file mode 100644
index b78dd1d..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-closedhand.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-cross.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-cross.png
deleted file mode 100644
index fe38e74..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-cross.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-forbidden.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-forbidden.png
deleted file mode 100644
index 2b08c4e..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-forbidden.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-hand.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-hand.png
deleted file mode 100644
index d2004ae..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-hand.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-hsplit.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-hsplit.png
deleted file mode 100644
index a5667e3..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-hsplit.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-ibeam.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-ibeam.png
deleted file mode 100644
index 097fc5f..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-ibeam.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-openhand.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-openhand.png
deleted file mode 100644
index 9181c85..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-openhand.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeall.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeall.png
deleted file mode 100644
index 69f13eb..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeall.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeb.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeb.png
deleted file mode 100644
index f37d7b9..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeb.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizef.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizef.png
deleted file mode 100644
index 3b127a0..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizef.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeh.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeh.png
deleted file mode 100644
index a9f40cb..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeh.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizev.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizev.png
deleted file mode 100644
index 1edbab2..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizev.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-uparrow.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-uparrow.png
deleted file mode 100644
index d3e70ef..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-uparrow.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-vsplit.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-vsplit.png
deleted file mode 100644
index 1beda25..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-vsplit.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-wait.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-wait.png
deleted file mode 100644
index 69056c4..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-wait.png and /dev/null differ
diff --git a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-whatsthis.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-whatsthis.png
deleted file mode 100644
index b47601c..0000000
Binary files a/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-whatsthis.png and /dev/null differ
diff --git a/src/mapmap/resources/images/box/box.png b/src/mapmap/resources/images/box/box.png
deleted file mode 100644
index 6c53ebf..0000000
Binary files a/src/mapmap/resources/images/box/box.png and /dev/null differ
diff --git a/src/mapmap/resources/images/box/box2.png b/src/mapmap/resources/images/box/box2.png
deleted file mode 100644
index e289322..0000000
Binary files a/src/mapmap/resources/images/box/box2.png and /dev/null differ
diff --git a/src/mapmap/resources/images/box/box3.png b/src/mapmap/resources/images/box/box3.png
deleted file mode 100644
index a2bb6d1..0000000
Binary files a/src/mapmap/resources/images/box/box3.png and /dev/null differ
diff --git a/src/mapmap/resources/images/checkbox/checkbox-checked-focused.png b/src/mapmap/resources/images/checkbox/checkbox-checked-focused.png
deleted file mode 100644
index 99def6e..0000000
Binary files a/src/mapmap/resources/images/checkbox/checkbox-checked-focused.png and /dev/null differ
diff --git a/src/mapmap/resources/images/checkbox/checkbox-checked.png b/src/mapmap/resources/images/checkbox/checkbox-checked.png
deleted file mode 100644
index c85e7ff..0000000
Binary files a/src/mapmap/resources/images/checkbox/checkbox-checked.png and /dev/null differ
diff --git a/src/mapmap/resources/images/checkbox/checkbox-unchecked-focused.png b/src/mapmap/resources/images/checkbox/checkbox-unchecked-focused.png
deleted file mode 100644
index 7fad500..0000000
Binary files a/src/mapmap/resources/images/checkbox/checkbox-unchecked-focused.png and /dev/null differ
diff --git a/src/mapmap/resources/images/checkbox/checkbox-unchecked.png b/src/mapmap/resources/images/checkbox/checkbox-unchecked.png
deleted file mode 100644
index 17aecd7..0000000
Binary files a/src/mapmap/resources/images/checkbox/checkbox-unchecked.png and /dev/null differ
diff --git a/src/mapmap/resources/images/ctrl/pause.png b/src/mapmap/resources/images/ctrl/pause.png
deleted file mode 100644
index 505033e..0000000
Binary files a/src/mapmap/resources/images/ctrl/pause.png and /dev/null differ
diff --git a/src/mapmap/resources/images/ctrl/play.png b/src/mapmap/resources/images/ctrl/play.png
deleted file mode 100644
index 3b01edb..0000000
Binary files a/src/mapmap/resources/images/ctrl/play.png and /dev/null differ
diff --git a/src/mapmap/resources/images/ctrl/stop.png b/src/mapmap/resources/images/ctrl/stop.png
deleted file mode 100644
index 83489c2..0000000
Binary files a/src/mapmap/resources/images/ctrl/stop.png and /dev/null differ
diff --git a/src/mapmap/resources/images/logo/logo_m_big_mapmap.png b/src/mapmap/resources/images/logo/logo_m_big_mapmap.png
deleted file mode 100644
index 39649ae..0000000
Binary files a/src/mapmap/resources/images/logo/logo_m_big_mapmap.png and /dev/null differ
diff --git a/src/mapmap/resources/images/logo/logo_m_mapmap.png b/src/mapmap/resources/images/logo/logo_m_mapmap.png
deleted file mode 100644
index b2d7609..0000000
Binary files a/src/mapmap/resources/images/logo/logo_m_mapmap.png and /dev/null differ
diff --git a/src/mapmap/resources/images/logo/logomapmap-light.png b/src/mapmap/resources/images/logo/logomapmap-light.png
deleted file mode 100644
index 3353f13..0000000
Binary files a/src/mapmap/resources/images/logo/logomapmap-light.png and /dev/null differ
diff --git a/src/mapmap/resources/images/logo/logomapmap.png b/src/mapmap/resources/images/logo/logomapmap.png
deleted file mode 100644
index a09bc6d..0000000
Binary files a/src/mapmap/resources/images/logo/logomapmap.png and /dev/null differ
diff --git a/src/mapmap/resources/images/logo/mapmap-fullname.svg b/src/mapmap/resources/images/logo/mapmap-fullname.svg
deleted file mode 100644
index 065589d..0000000
--- a/src/mapmap/resources/images/logo/mapmap-fullname.svg
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="512"
-   height="512"
-   xml:space="preserve"
-   sodipodi:docname="icon.eps"><metadata
-     id="metadata8"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs6" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     id="namedview4"
-     showgrid="false"
-     inkscape:zoom="0.50706345"
-     inkscape:cx="681.62178"
-     inkscape:cy="239.36085"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g10" /><g
-     id="g10"
-     inkscape:groupmode="layer"
-     inkscape:label="ink_ext_XXXXXX"
-     transform="matrix(1.25,0,0,-1.25,0,512.00001)"><g
-       id="g3012"
-       transform="matrix(0.81272615,0,0,0.81272615,1.9721398,50.925783)"><path
-         d="m 440.542,186.334 -40.133,0 0,73.133 40.134,0 c 31.116,0 56.431,25.312 56.431,56.425 0,31.122 -25.315,56.442 -56.431,56.442 l -94.548,0 0,-42.281 13.613,-18.742 -13.613,0 0,-57.916 -48.17,118.941 -49.509,0 -52.122,-128.706 0,128.706 -46.274,0 L 97.7734,318.062 46.332,372.336 0,372.336 0,0 46.3164,0 141.79,100.363 141.79,0 l 89.862,0 13.982,36.2641 2.766,-9.0762 55.449,0 L 314.288,0 l 86.124,0 0,73.4672 40.13,0 c 31.118,0 56.435,25.3117 56.435,56.4248 0,31.122 -25.317,56.442 -56.435,56.442"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path14"
-         inkscape:connector-curvature="0" /><path
-         d="m 40.2371,235.643 39.8906,41.66 -39.8906,42.857 0,-84.517 z m 141.7849,120.659 0,-157.988 -26.064,0 0,121.651 -115.7209,-121.651 -26.0641,0 0,157.988 26.0641,0 57.4656,-60.63 58.2553,60.63 26.064,0"
-         style="fill:#2d2f3e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path16"
-         inkscape:connector-curvature="0" /><path
-         d="m 273.07,331.023 -12.636,-32.785 26.265,-71.485 -27.252,0 -12.24,37.119 -25.28,-65.558 -28.039,0 63.98,157.988 30.405,0 63.985,-157.988 -28.235,0 -50.953,132.709"
-         style="fill:#2d2f3e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path18"
-         inkscape:connector-curvature="0" /><path
-         d="m 388.011,332.797 28.635,-37.52 23.897,0 c 8.887,0 16.189,8.494 16.189,18.754 0,10.276 -7.302,18.766 -16.189,18.766 l -52.532,0 z m -1.775,-61.017 0,-73.466 -26.068,0 0,96.963 27.252,0 -27.252,37.52 0,23.503 80.375,0 c 23.293,0 42.258,-18.965 42.258,-42.269 0,-23.293 -18.965,-42.251 -42.258,-42.251 l -54.307,0"
-         style="fill:#2d2f3e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path20"
-         inkscape:connector-curvature="0" /><path
-         d="m 388.007,148.797 28.639,-37.521 23.894,0 c 8.882,0 16.192,8.496 16.192,18.755 0,10.276 -7.31,18.766 -16.192,18.766 l -52.533,0 z m -1.77,-61.0169 0,-73.466 -26.069,0 0,96.9619 27.252,0 -27.252,37.521 0,23.503 80.372,0 c 23.299,0 42.262,-18.965 42.262,-42.269 0,-23.293 -18.963,-42.2509 -42.262,-42.2509 l -54.303,0"
-         style="fill:#2d2f3e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path22"
-         inkscape:connector-curvature="0" /><path
-         d="m 40.2371,51.5031 39.8891,41.6598 -39.8891,42.8581 0,-84.5179 z m 141.7889,120.6589 0,-157.9882 -26.063,0 0,121.6512 -115.7259,-121.6512 -26.0641,0 0,157.9882 26.0641,0 57.4649,-60.63 58.261,60.63 26.063,0"
-         style="fill:#2d2f3e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path24"
-         inkscape:connector-curvature="0" /><path
-         d="m 273.068,146.883 -12.633,-32.784 25.719,-72.7381 -27.257,0 -11.693,38.3711 -25.277,-65.5582 -28.039,0 63.98,157.9882 30.41,0 63.98,-157.9882 -28.23,0 -50.96,132.7092"
-         style="fill:#2d2f3e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path26"
-         inkscape:connector-curvature="0" /></g></g></svg>
\ No newline at end of file
diff --git a/src/mapmap/resources/images/logo/mapmap-logo.png b/src/mapmap/resources/images/logo/mapmap-logo.png
deleted file mode 100644
index f35732b..0000000
Binary files a/src/mapmap/resources/images/logo/mapmap-logo.png and /dev/null differ
diff --git a/src/mapmap/resources/images/logo/mapmap-wide-with-border.svg b/src/mapmap/resources/images/logo/mapmap-wide-with-border.svg
deleted file mode 100644
index 76f9af9..0000000
--- a/src/mapmap/resources/images/logo/mapmap-wide-with-border.svg
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1024"
-   height="192"
-   viewBox="0 0 1024 192"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="mapmap-wide-with-border.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.1689453"
-     inkscape:cx="512"
-     inkscape:cy="96"
-     inkscape:document-units="px"
-     inkscape:current-layer="g4313"
-     showgrid="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="1022"
-     inkscape:window-x="1050"
-     inkscape:window-y="340"
-     inkscape:window-maximized="1"
-     units="px" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="mapmap-font-strock"
-     style="display:inline"
-     transform="translate(0,-552.09448)" />
-  <g
-     style="display:inline"
-     inkscape:label="mapmap-font"
-     id="g4313"
-     inkscape:groupmode="layer"
-     transform="translate(0,-552.09448)">
-    <g
-       id="g4152"
-       transform="translate(-16.70785,276.0476)">
-      <path
-         sodipodi:nodetypes="ccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path16"
-         style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:30;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 213.13908,291.79626 0,160.50123 -26.47862,0 0,-123.5862 -117.561741,123.5862 -26.47872,0 0,-160.50123 26.47872,0 58.379741,61.59448 59.182,-61.59448 26.47862,0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path18"
-         style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:30;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 305.61895,317.47739 -12.83701,33.30653 26.68281,72.62217 -27.68551,0 -12.43472,-37.70948 -25.68214,66.60088 -28.48504,0 64.99778,-160.50123 30.88867,0 65.00285,160.50123 -28.68415,0 -51.76354,-134.8201" />
-      <path
-         sodipodi:nodetypes="cccccccsssc"
-         inkscape:connector-curvature="0"
-         id="path20"
-         style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:30;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 424.58761,377.66078 0,74.63468 -26.48269,0 0,-98.50547 27.68552,0 -27.68552,-38.11685 0,-23.87688 81.65359,0 c 23.66353,0 42.93022,19.26669 42.93022,42.9414 0,23.66354 -19.26669,42.92312 -42.93022,42.92312 l -55.1709,0" />
-      <path
-         sodipodi:nodetypes="ccccccccccc"
-         d="m 705.24607,291.79626 0,160.50123 -26.47862,0 0,-123.5862 -117.56174,123.5862 -26.47872,0 0,-160.50123 26.47872,0 58.37974,61.59448 59.182,-61.59448 26.47862,0"
-         style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:30;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4307"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 797.72597,317.47739 -12.83701,33.30653 26.68281,72.62217 -27.68551,0 -12.43472,-37.70948 -25.68214,66.60088 -28.48504,0 64.99778,-160.50123 30.88867,0 65.00285,160.50123 -28.68415,0 -51.76354,-134.8201"
-         style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:30;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4309"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="cccccccsssc"
-         d="m 916.6946,377.66078 0,74.63468 -26.48269,0 0,-98.50547 27.68552,0 -27.68552,-38.11685 0,-23.87688 81.65359,0 c 23.66353,0 42.9302,19.26669 42.9302,42.9414 0,23.66354 -19.26667,42.92312 -42.9302,42.92312 l -55.1709,0"
-         style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:30;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4311"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 69.098719,414.37467 40.525171,-42.32272 -40.525171,-43.53876 0,85.86148 z m 144.040361,-122.57841 0,160.50123 -26.47862,0 0,-123.5862 -117.561741,123.5862 -26.47872,0 0,-160.50123 26.47872,0 58.379741,61.59448 59.182,-61.59448 26.47862,0"
-         style="display:inline;fill:#2d2f3e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4315"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 305.61895,317.47739 -12.83701,33.30653 26.68281,72.62217 -27.68551,0 -12.43472,-37.70948 -25.68214,66.60088 -28.48504,0 64.99778,-160.50123 30.88867,0 65.00285,160.50123 -28.68415,0 -51.76354,-134.8201"
-         style="display:inline;fill:#2d2f3e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4317"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 426.39084,315.67314 29.09052,38.11685 24.27715,0 c 9.02837,0 16.44653,-8.62912 16.44653,-19.05233 0,-10.43947 -7.41816,-19.06452 -16.44653,-19.06452 l -53.36767,0 z m -1.80323,61.98764 0,74.63468 -26.48269,0 0,-98.50547 27.68552,0 -27.68552,-38.11685 0,-23.87688 81.65359,0 c 23.66353,0 42.93022,19.26669 42.93022,42.9414 0,23.66354 -19.26669,42.92312 -42.93022,42.92312 l -55.1709,0"
-         style="display:inline;fill:#2d2f3e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4319"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4321"
-         style="display:inline;fill:#2d2f3e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 561.20571,414.37467 40.52517,-42.32272 -40.52517,-43.53876 0,85.86148 z m 144.04036,-122.57841 0,160.50123 -26.47862,0 0,-123.5862 -117.56174,123.5862 -26.47872,0 0,-160.50123 26.47872,0 58.37974,61.59448 59.182,-61.59448 26.47862,0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4323"
-         style="display:inline;fill:#2d2f3e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 797.72597,317.47739 -12.83701,33.30653 26.68281,72.62217 -27.68551,0 -12.43472,-37.70948 -25.68214,66.60088 -28.48504,0 64.99778,-160.50123 30.88867,0 65.00285,160.50123 -28.68415,0 -51.76354,-134.8201" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4325"
-         style="display:inline;fill:#2d2f3e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 918.49783,315.67314 29.09052,38.11685 24.27715,0 c 9.02837,0 16.44653,-8.62912 16.44653,-19.05233 0,-10.43947 -7.41816,-19.06452 -16.44653,-19.06452 l -53.36767,0 z m -1.80323,61.98764 0,74.63468 -26.48269,0 0,-98.50547 27.68552,0 -27.68552,-38.11685 0,-23.87688 81.65359,0 c 23.66353,0 42.9302,19.26669 42.9302,42.9414 0,23.66354 -19.26667,42.92312 -42.9302,42.92312 l -55.1709,0" />
-    </g>
-  </g>
-</svg>
diff --git a/src/mapmap/resources/images/logo/mapmap.svg b/src/mapmap/resources/images/logo/mapmap.svg
deleted file mode 100644
index 9f20b97..0000000
--- a/src/mapmap/resources/images/logo/mapmap.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   width="512"
-   height="512"
-   xml:space="preserve"
-   sodipodi:docname="mapmap-fullname.svg"><metadata
-     id="metadata8"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs6" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     id="namedview4"
-     showgrid="true"
-     inkscape:zoom="0.71709601"
-     inkscape:cx="290.95559"
-     inkscape:cy="176.7205"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g10"
-     inkscape:snap-global="false"><inkscape:grid
-       type="xygrid"
-       id="grid3066"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" /></sodipodi:namedview><g
-     id="g10"
-     inkscape:groupmode="layer"
-     inkscape:label="ink_ext_XXXXXX"
-     transform="matrix(1.25,0,0,-1.25,0,512.00001)"><g
-       id="g3836"
-       transform="matrix(2.5235599,0,0,2.5235599,1.5440273,-503.33883)"><path
-         sodipodi:nodetypes="ccccccccccc"
-         inkscape:connector-curvature="0"
-         id="path3064"
-         d="m 1.1832845,353.40746 39.4427955,-1e-5 41.414936,-43.7815 42.203794,44.17593 37.07622,0 0.44208,-152.78657 -44.31889,-0.34678 0.78886,77.05912 -71.195598,-76.56939 -45.4597696,-0.39443 z"
-         style="fill:#ffffff;stroke:none" /></g><path
-       inkscape:connector-curvature="0"
-       id="path16"
-       style="fill:#2d2f3e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 89.045649,108.47055 81.814151,85.44311 -81.814151,87.89815 0,-173.34126 z m 290.795611,247.46717 0,-324.027567 -53.45632,0 0,249.501717 -237.339291,-249.501717 -53.456507,0 0,324.027567 53.456507,0 117.859831,-124.34991 119.47946,124.34991 53.45632,0" /></g></svg>
\ No newline at end of file
diff --git a/src/mapmap/resources/images/logo/splash.png b/src/mapmap/resources/images/logo/splash.png
deleted file mode 100644
index aebcbd9..0000000
Binary files a/src/mapmap/resources/images/logo/splash.png and /dev/null differ
diff --git a/src/mapmap/resources/images/media/photo.png b/src/mapmap/resources/images/media/photo.png
deleted file mode 100644
index a3a82fd..0000000
Binary files a/src/mapmap/resources/images/media/photo.png and /dev/null differ
diff --git a/src/mapmap/resources/images/media/video.png b/src/mapmap/resources/images/media/video.png
deleted file mode 100644
index 4ee5d48..0000000
Binary files a/src/mapmap/resources/images/media/video.png and /dev/null differ
diff --git a/src/mapmap/resources/images/media/webcam.png b/src/mapmap/resources/images/media/webcam.png
deleted file mode 100644
index ab674f8..0000000
Binary files a/src/mapmap/resources/images/media/webcam.png and /dev/null differ
diff --git a/src/mapmap/resources/images/menu/add_cam.png b/src/mapmap/resources/images/menu/add_cam.png
deleted file mode 100644
index dde3511..0000000
Binary files a/src/mapmap/resources/images/menu/add_cam.png and /dev/null differ
diff --git a/src/mapmap/resources/images/menu/add_color.png b/src/mapmap/resources/images/menu/add_color.png
deleted file mode 100644
index 69a3904..0000000
Binary files a/src/mapmap/resources/images/menu/add_color.png and /dev/null differ
diff --git a/src/mapmap/resources/images/menu/fullscreen.png b/src/mapmap/resources/images/menu/fullscreen.png
deleted file mode 100644
index 812fa90..0000000
Binary files a/src/mapmap/resources/images/menu/fullscreen.png and /dev/null differ
diff --git a/src/mapmap/resources/images/menu/midi.png b/src/mapmap/resources/images/menu/midi.png
deleted file mode 100644
index 3b5eaac..0000000
Binary files a/src/mapmap/resources/images/menu/midi.png and /dev/null differ
diff --git a/src/mapmap/resources/images/menu/preferences.png b/src/mapmap/resources/images/menu/preferences.png
deleted file mode 100644
index 3a07a4d..0000000
Binary files a/src/mapmap/resources/images/menu/preferences.png and /dev/null differ
diff --git a/src/mapmap/resources/images/menu/record.png b/src/mapmap/resources/images/menu/record.png
deleted file mode 100644
index 24ab1bc..0000000
Binary files a/src/mapmap/resources/images/menu/record.png and /dev/null differ
diff --git a/src/mapmap/resources/images/menu/reseaux.png b/src/mapmap/resources/images/menu/reseaux.png
deleted file mode 100644
index 668997f..0000000
Binary files a/src/mapmap/resources/images/menu/reseaux.png and /dev/null differ
diff --git a/src/mapmap/resources/images/menu/save.png b/src/mapmap/resources/images/menu/save.png
deleted file mode 100644
index 73a1d80..0000000
Binary files a/src/mapmap/resources/images/menu/save.png and /dev/null differ
diff --git a/src/mapmap/resources/images/menu/sound.png b/src/mapmap/resources/images/menu/sound.png
deleted file mode 100644
index 61d2465..0000000
Binary files a/src/mapmap/resources/images/menu/sound.png and /dev/null differ
diff --git a/src/mapmap/resources/images/menu/webcam.png b/src/mapmap/resources/images/menu/webcam.png
deleted file mode 100644
index 6ce6e4f..0000000
Binary files a/src/mapmap/resources/images/menu/webcam.png and /dev/null differ
diff --git a/src/mapmap/resources/images/shapes/add_circle.png b/src/mapmap/resources/images/shapes/add_circle.png
deleted file mode 100644
index 7891480..0000000
Binary files a/src/mapmap/resources/images/shapes/add_circle.png and /dev/null differ
diff --git a/src/mapmap/resources/images/shapes/add_line.png b/src/mapmap/resources/images/shapes/add_line.png
deleted file mode 100644
index 26386b8..0000000
Binary files a/src/mapmap/resources/images/shapes/add_line.png and /dev/null differ
diff --git a/src/mapmap/resources/images/shapes/add_quad.png b/src/mapmap/resources/images/shapes/add_quad.png
deleted file mode 100644
index e2dc266..0000000
Binary files a/src/mapmap/resources/images/shapes/add_quad.png and /dev/null differ
diff --git a/src/mapmap/resources/images/shapes/add_triangle.png b/src/mapmap/resources/images/shapes/add_triangle.png
deleted file mode 100644
index fbb7a13..0000000
Binary files a/src/mapmap/resources/images/shapes/add_triangle.png and /dev/null differ
diff --git a/src/mapmap/resources/images/shapes/mask.png b/src/mapmap/resources/images/shapes/mask.png
deleted file mode 100644
index a9b05f6..0000000
Binary files a/src/mapmap/resources/images/shapes/mask.png and /dev/null differ
diff --git a/src/mapmap/resources/images/shapes/timeline.png b/src/mapmap/resources/images/shapes/timeline.png
deleted file mode 100644
index 719370b..0000000
Binary files a/src/mapmap/resources/images/shapes/timeline.png and /dev/null differ
diff --git a/src/mapmap/resources/images/shapes/warping.png b/src/mapmap/resources/images/shapes/warping.png
deleted file mode 100644
index ed60e3c..0000000
Binary files a/src/mapmap/resources/images/shapes/warping.png and /dev/null differ
diff --git a/src/mapmap/resources/images/test-signal/examples/classic-test-card.png b/src/mapmap/resources/images/test-signal/examples/classic-test-card.png
deleted file mode 100644
index 4e3e40f..0000000
Binary files a/src/mapmap/resources/images/test-signal/examples/classic-test-card.png and /dev/null differ
diff --git a/src/mapmap/resources/images/test-signal/examples/ntsc-test-card.png b/src/mapmap/resources/images/test-signal/examples/ntsc-test-card.png
deleted file mode 100644
index 11a3b98..0000000
Binary files a/src/mapmap/resources/images/test-signal/examples/ntsc-test-card.png and /dev/null differ
diff --git a/src/mapmap/resources/images/test-signal/examples/pal-test-card.png b/src/mapmap/resources/images/test-signal/examples/pal-test-card.png
deleted file mode 100644
index e60adac..0000000
Binary files a/src/mapmap/resources/images/test-signal/examples/pal-test-card.png and /dev/null differ
diff --git a/src/mapmap/resources/images/test-signal/ntsc-test-signal.svg b/src/mapmap/resources/images/test-signal/ntsc-test-signal.svg
deleted file mode 100644
index a76a1bd..0000000
--- a/src/mapmap/resources/images/test-signal/ntsc-test-signal.svg
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="672"
-   height="504"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ntsc-test-signal.svg">
-  <metadata
-     id="metadata24">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1680"
-     inkscape:window-height="1022"
-     id="namedview22"
-     showgrid="false"
-     inkscape:zoom="1.8557524"
-     inkscape:cx="301.89736"
-     inkscape:cy="252"
-     inkscape:window-x="1050"
-     inkscape:window-y="340"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs4" />
-  <g
-     id="layer1">
-    <rect
-       width="672"
-       height="504"
-       x="0"
-       y="0"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2762" />
-    <rect
-       width="96"
-       height="336"
-       x="0"
-       y="0"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2768" />
-    <rect
-       width="96"
-       height="336"
-       x="96"
-       y="0"
-       transform="translate(-6.4e-5,0)"
-       style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2770" />
-    <rect
-       width="128"
-       height="336"
-       x="192"
-       y="0"
-       transform="matrix(0.75,0,0,1,48,0)"
-       style="fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2772" />
-    <rect
-       width="128"
-       height="336"
-       x="288"
-       y="0"
-       transform="matrix(0.75,0,0,1,72,0)"
-       style="fill:#00ff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2774" />
-    <rect
-       width="128"
-       height="336"
-       x="384"
-       y="0"
-       transform="matrix(0.75,0,0,1,96,0)"
-       style="fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2776" />
-    <rect
-       width="128"
-       height="336"
-       x="480"
-       y="0"
-       transform="matrix(0.75,0,0,1,120,0)"
-       style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2778" />
-    <rect
-       width="128"
-       height="336"
-       x="576"
-       y="0"
-       transform="matrix(0.75,0,0,1,144,0)"
-       style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2780" />
-    <rect
-       width="96"
-       height="42"
-       x="0"
-       y="336"
-       style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2782" />
-    <rect
-       width="96"
-       height="42"
-       x="192"
-       y="336"
-       style="fill:#ff00ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2784" />
-    <rect
-       width="96"
-       height="42"
-       x="384"
-       y="336"
-       style="fill:#00ffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2786" />
-    <rect
-       width="96"
-       height="42"
-       x="576"
-       y="336"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2788" />
-    <rect
-       width="128"
-       height="126"
-       x="0"
-       y="378"
-       transform="scale(0.9375,1)"
-       style="fill:#000080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2790" />
-    <rect
-       width="128"
-       height="126"
-       x="0"
-       y="378"
-       transform="matrix(0.9375,0,0,1,120,0)"
-       style="fill:white;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2796" />
-    <rect
-       width="128"
-       height="126"
-       x="0"
-       y="378"
-       transform="matrix(0.9375,0,0,1,240,0)"
-       style="fill:#800080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2798" />
-    <rect
-       width="32"
-       height="126"
-       x="512"
-       y="378"
-       style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2800" />
-    <rect
-       width="32"
-       height="126"
-       x="544"
-       y="378"
-       style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-opacity:1"
-       id="rect2802" />
-  </g>
-</svg>
diff --git a/src/mapmap/resources/images/test-signal/pal-test-signal.svg b/src/mapmap/resources/images/test-signal/pal-test-signal.svg
deleted file mode 100644
index acdfac5..0000000
--- a/src/mapmap/resources/images/test-signal/pal-test-signal.svg
+++ /dev/null
@@ -1,1133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   x="0px"
-   y="0px"
-   width="600"
-   height="600"
-   viewBox="0 0 600 600"
-   enable-background="new 0 0 217 215"
-   xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="pal-test-signal.svg"><metadata
-     id="metadata562"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-     id="defs560"><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4364"
-       x1="947.47308"
-       x2="968.01044"
-       xlink:href="#linearGradient4210" /><linearGradient
-       id="linearGradient4210"><stop
-         offset="0"
-         id="stop7" /><stop
-         offset=".04684"
-         id="stop9" /><stop
-         offset=".11671"
-         stop-color="#fff"
-         id="stop11" /><stop
-         offset=".192"
-         id="stop13" /><stop
-         offset=".23979"
-         id="stop15" /><stop
-         offset=".31315"
-         stop-color="#fff"
-         id="stop17" /><stop
-         offset=".39347"
-         stop-color="#010101"
-         id="stop19" /><stop
-         offset=".44833"
-         id="stop21" /><stop
-         offset=".52621"
-         stop-color="#fff"
-         id="stop23" /><stop
-         offset=".60357"
-         id="stop25" /><stop
-         offset=".65357"
-         id="stop27" /><stop
-         offset=".7317"
-         stop-color="#fff"
-         id="stop29" /><stop
-         offset=".80949"
-         id="stop31" /><stop
-         offset=".85804"
-         id="stop33" /><stop
-         offset=".92704"
-         stop-color="#fff"
-         id="stop35" /><stop
-         offset="1"
-         id="stop37" /></linearGradient><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4361"
-       x1="967.94489"
-       x2="988.4823"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4358"
-       x1="988.24023"
-       x2="1008.7776"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4355"
-       x1="1008.7335"
-       x2="1029.2709"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4375"
-       x1="1029.2372"
-       x2="1049.7745"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4377"
-       x1="1049.5325"
-       x2="1070.0699"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4379"
-       x1="1070.0258"
-       x2="1090.5632"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5182"
-       x1="947.47308"
-       x2="968.01044"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5218"
-       x1="967.94489"
-       x2="988.4823"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5254"
-       x1="988.24023"
-       x2="1008.7776"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5290"
-       x1="1008.7335"
-       x2="1029.2709"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5326"
-       x1="1029.2372"
-       x2="1049.7745"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5362"
-       x1="1049.5325"
-       x2="1070.0699"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5398"
-       x1="1070.0258"
-       x2="1090.5632"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5434"
-       x1="1070.0258"
-       x2="1090.5632"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5470"
-       x1="1049.5325"
-       x2="1070.0699"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5506"
-       x1="1029.2372"
-       x2="1049.7745"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5542"
-       x1="1008.7335"
-       x2="1029.2709"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5578"
-       x1="988.24023"
-       x2="1008.7776"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5614"
-       x1="967.94489"
-       x2="988.4823"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5650"
-       x1="947.47308"
-       x2="968.01044"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(296.53139,139.82055)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4367"
-       x1="927.17773"
-       x2="947.71509"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(296.53139,139.82055)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4283"
-       x1="895.42114"
-       x2="927.16644"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(296.53139,139.82055)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4270"
-       x1="863.74402"
-       x2="895.48932"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(296.53139,139.82055)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4266"
-       x1="832.37286"
-       x2="864.11816"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(296.53139,139.82055)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4262"
-       x1="800.72894"
-       x2="832.47424"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(296.53139,139.82055)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4258"
-       x1="769.35779"
-       x2="801.26093"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(296.53139,139.82055)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4254"
-       x1="717.31677"
-       x2="770.22424"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(296.53139,139.82055)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4250"
-       x1="665.84143"
-       x2="718.7489"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(296.53139,139.82055)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4246"
-       x1="613.23474"
-       x2="666.14227"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(296.53139,139.82055)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4208"
-       x1="460.03436"
-       x2="613.61414"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4364-3"
-       x1="947.47308"
-       x2="968.01044"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4361-6"
-       x1="967.94489"
-       x2="988.4823"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4358-2"
-       x1="988.24023"
-       x2="1008.7776"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4355-6"
-       x1="1008.7335"
-       x2="1029.2709"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4375-1"
-       x1="1029.2372"
-       x2="1049.7745"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4377-8"
-       x1="1049.5325"
-       x2="1070.0699"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4379-7"
-       x1="1070.0258"
-       x2="1090.5632"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6531"
-       x1="947.47308"
-       x2="968.01044"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6567"
-       x1="967.94489"
-       x2="988.4823"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6603"
-       x1="988.24023"
-       x2="1008.7776"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6639"
-       x1="1008.7335"
-       x2="1029.2709"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6675"
-       x1="1029.2372"
-       x2="1049.7745"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6711"
-       x1="1049.5325"
-       x2="1070.0699"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6747"
-       x1="1070.0258"
-       x2="1090.5632"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6783"
-       x1="1070.0258"
-       x2="1090.5632"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6819"
-       x1="1029.2372"
-       x2="1049.7745"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6855"
-       x1="1049.5325"
-       x2="1070.0699"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6891"
-       x1="1008.7335"
-       x2="1029.2709"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6927"
-       x1="967.94489"
-       x2="988.4823"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6963"
-       x1="988.24023"
-       x2="1008.7776"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(468.98047,295.44179)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4367-9"
-       x1="927.17773"
-       x2="947.71509"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7034"
-       x1="947.47308"
-       x2="968.01044"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(468.98047,295.44179)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4270-2"
-       x1="863.74402"
-       x2="895.48932"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(468.98047,295.44179)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4266-0"
-       x1="832.37286"
-       x2="864.11816"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(468.98047,295.44179)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4258-2"
-       x1="769.35779"
-       x2="801.26093"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(468.98047,295.44179)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4262-3"
-       x1="800.72894"
-       x2="832.47424"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(468.98047,295.44179)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4254-7"
-       x1="717.31677"
-       x2="770.22424"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(468.98047,295.44179)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4246-5"
-       x1="613.23474"
-       x2="666.14227"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(468.98047,295.44179)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4250-9"
-       x1="665.84143"
-       x2="718.7489"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(468.98047,295.44179)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4208-2"
-       x1="460.03436"
-       x2="613.61414"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(468.98047,295.44179)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4283-2"
-       x1="895.42114"
-       x2="927.16644"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4364-8"
-       x1="947.47308"
-       x2="968.01044"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4361-3"
-       x1="967.94489"
-       x2="988.4823"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4358-6"
-       x1="988.24023"
-       x2="1008.7776"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4355-1"
-       x1="1008.7335"
-       x2="1029.2709"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4375-0"
-       x1="1029.2372"
-       x2="1049.7745"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4377-6"
-       x1="1049.5325"
-       x2="1070.0699"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4379-3"
-       x1="1070.0258"
-       x2="1090.5632"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7737"
-       x1="947.47308"
-       x2="968.01044"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7773"
-       x1="967.94489"
-       x2="988.4823"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7809"
-       x1="988.24023"
-       x2="1008.7776"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7845"
-       x1="1008.7335"
-       x2="1029.2709"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7881"
-       x1="1029.2372"
-       x2="1049.7745"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7917"
-       x1="1049.5325"
-       x2="1070.0699"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7953"
-       x1="1070.0258"
-       x2="1090.5632"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient7989"
-       x1="1070.0258"
-       x2="1090.5632"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8025"
-       x1="1049.5325"
-       x2="1070.0699"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8061"
-       x1="1029.2372"
-       x2="1049.7745"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8097"
-       x1="1008.7335"
-       x2="1029.2709"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8133"
-       x1="988.24023"
-       x2="1008.7776"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8169"
-       x1="967.94489"
-       x2="988.4823"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8205"
-       x1="947.47308"
-       x2="968.01044"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4367-2"
-       x1="927.17773"
-       x2="947.71509"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4283-0"
-       x1="895.42114"
-       x2="927.16644"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4270-6"
-       x1="863.74402"
-       x2="895.48932"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4266-1"
-       x1="832.37286"
-       x2="864.11816"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4262-5"
-       x1="800.72894"
-       x2="832.47424"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4258-5"
-       x1="769.35779"
-       x2="801.26093"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4254-4"
-       x1="717.31677"
-       x2="770.22424"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4250-7"
-       x1="665.84143"
-       x2="718.7489"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4246-6"
-       x1="613.23474"
-       x2="666.14227"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4208-5"
-       x1="460.03436"
-       x2="613.61414"
-       xlink:href="#linearGradient4210" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       x2="968.01044"
-       x1="947.47308"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8765"
-       xlink:href="#linearGradient4210"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       x2="988.4823"
-       x1="967.94489"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8767"
-       xlink:href="#linearGradient4210"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       x2="1008.7776"
-       x1="988.24023"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8769"
-       xlink:href="#linearGradient4210"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       x2="1029.2709"
-       x1="1008.7335"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8771"
-       xlink:href="#linearGradient4210"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       x2="1049.7745"
-       x1="1029.2372"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8773"
-       xlink:href="#linearGradient4210"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       x2="1070.0699"
-       x1="1049.5325"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8775"
-       xlink:href="#linearGradient4210"
-       inkscape:collect="always" /><linearGradient
-       gradientTransform="translate(386.54972,257.61568)"
-       x2="1090.5632"
-       x1="1070.0258"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8777"
-       xlink:href="#linearGradient4210"
-       inkscape:collect="always" /><linearGradient
-       x2="968.01044"
-       x1="947.47308"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8779"
-       xlink:href="#linearGradient4210"
-       inkscape:collect="always" /><linearGradient
-       x2="988.4823"
-       x1="967.94489"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8781"
-       xlink:href="#linearGradient4210"
-       inkscape:collect="always" /><linearGradient
-       x2="1008.7776"
-       x1="988.24023"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8783"
-       xlink:href="#linearGradient4210"
-       inkscape:collect="always" /><linearGradient
-       x2="1029.2709"
-       x1="1008.7335"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8785"
-       xlink:href="#linearGradient4210"
-       inkscape:collect="always" /><linearGradient
-       x2="1049.7745"
-       x1="1029.2372"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8787"
-       xlink:href="#linearGradient4210"
-       inkscape:collect="always" /><linearGradient
-       x2="1070.0699"
-       x1="1049.5325"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8789"
-       xlink:href="#linearGradient4210"
-       inkscape:collect="always" /><linearGradient
-       x2="1090.5632"
-       x1="1070.0258"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient8791"
-       xlink:href="#linearGradient4210"
-       inkscape:collect="always" /></defs><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1680"
-     inkscape:window-height="1022"
-     id="namedview558"
-     showgrid="false"
-     inkscape:zoom="0.6775"
-     inkscape:cx="300"
-     inkscape:cy="300"
-     inkscape:window-x="1050"
-     inkscape:window-y="340"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer3" /><g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="mapmap-test-pattern"
-     style="display:inline"><g
-       id="g7295"
-       transform="matrix(0.66120917,0,0,0.66120917,-511.00592,-218.96407)"><g
-         id="g7482"><path
-           id="path626"
-           d="m 931.9678,441.5092 c -3.14018,2.71466 -6.32487,5.38823 -9.38888,8.1875 -5.335,4.87403 -10.54109,9.87693 -15.63776,15 -5.09667,5.12307 -10.0738,10.35612 -14.92272,15.71875 -2.05424,2.27188 -3.99161,4.65509 -6.00018,6.96875 -2.73253,3.14759 -5.52997,6.2454 -8.1764,9.46875 -4.59172,5.59269 -9.04318,11.31172 -13.36827,17.125 -0.93485,1.25651 -1.78262,2.5772 -2.70474,3.84375 l 24.24941,0 75.45299,0 75.45295,0 0,-76.3125 -75.45295,0 -29.50345,0 z"
-           inkscape:connector-curvature="0"
-           style="fill-rule:evenodd;stroke:#000000;stroke-width:1.54100001;stroke-linecap:square" /><path
-           id="path628"
-           d="m 1416.1742,441.5092 0,76.3125 75.3711,0 75.3711,0 24.2231,0 c -0.9212,-1.26655 -1.7681,-2.58724 -2.7018,-3.84375 -4.3205,-5.81328 -8.7669,-11.53231 -13.3538,-17.125 -2.6435,-3.22335 -5.4379,-6.32116 -8.1675,-9.46875 -2.0064,-2.31366 -3.9415,-4.69687 -5.9937,-6.96875 -4.8435,-5.36263 -9.8153,-10.59568 -14.9066,-15.71875 -5.0913,-5.12307 -10.2915,-10.12597 -15.6207,-15 -3.0607,-2.79927 -6.242,-5.47284 -9.3787,-8.1875 l -29.4714,0 -75.3711,0 z"
-           inkscape:connector-curvature="0"
-           style="fill-rule:evenodd;stroke:#000000;stroke-width:1.54100001;stroke-linecap:square" /><path
-           id="path630"
-           d="m 1221.768,332.60291 c -103.032,1.08245 -205.7603,37.23259 -289.09376,108.4375 l 587.96876,0.1875 c -85.9355,-73.5163 -192.5722,-109.74181 -298.875,-108.625 z m -222.75001,108.90625 0,76.3125 455.06241,0 0,-76.3125 -455.06241,0 z"
-           inkscape:connector-curvature="0"
-           style="fill:#ffffff;stroke:#ffffff;stroke-width:1.54100001;stroke-linecap:square" /><path
-           id="path632"
-           d="m 1278.8697,517.82169 -52.2509,0 0,76.33425 52.2509,0 z"
-           inkscape:connector-curvature="0"
-           style="fill-rule:evenodd" /><path
-           id="path634"
-           d="m 1226.6189,517.82169 -52.2509,0 0,76.33425 52.2509,0 z"
-           inkscape:connector-curvature="0"
-           style="fill:#bfbfbf;fill-opacity:1;fill-rule:evenodd" /><path
-           id="path636"
-           d="m 1122.1172,517.82715 -52.2509,0 0,76.33425 52.2509,0 z"
-           inkscape:connector-curvature="0"
-           style="fill:#bfbfbf;fill-opacity:1;fill-rule:evenodd" /><path
-           id="path638"
-           d="m 1174.368,517.82715 -52.2509,0 0,76.33425 52.2509,0 z"
-           inkscape:connector-curvature="0"
-           style="fill-rule:evenodd" /><path
-           id="path640"
-           d="m 1069.8663,517.82715 -52.2509,0 0,76.33425 52.2509,0 z"
-           inkscape:connector-curvature="0"
-           style="fill-rule:evenodd" /><path
-           id="path642"
-           d="m 1017.6154,517.82715 -52.25083,0 0,76.33425 52.25083,0 z"
-           inkscape:connector-curvature="0"
-           style="fill:#bfbfbf;fill-opacity:1;fill-rule:evenodd" /><path
-           id="path644"
-           d="m 913.11373,517.83262 -52.25088,0 0,76.33425 52.25088,0 z"
-           inkscape:connector-curvature="0"
-           style="fill:#bfbfbf;fill-opacity:1;fill-rule:evenodd" /><path
-           id="path646"
-           d="m 965.36458,517.83262 -52.25087,0 0,76.33425 52.25087,0 z"
-           inkscape:connector-curvature="0"
-           style="fill-rule:evenodd" /><path
-           id="path648"
-           d="m 1592.3748,517.82166 -52.2508,0 0,76.33425 52.2508,0 z"
-           inkscape:connector-curvature="0"
-           style="fill-rule:evenodd" /><path
-           id="path650"
-           d="m 1540.124,517.82166 -52.2509,0 0,76.33425 52.2509,0 z"
-           inkscape:connector-curvature="0"
-           style="fill:#bfbfbf;fill-opacity:1;fill-rule:evenodd" /><path
-           id="path652"
-           d="m 1435.6223,517.82712 -52.2509,0 0,76.33425 52.2509,0 z"
-           inkscape:connector-curvature="0"
-           style="fill:#bfbfbf;fill-opacity:1;fill-rule:evenodd" /><path
-           id="path654"
-           d="m 1487.8732,517.82712 -52.2509,0 0,76.33425 52.2509,0 z"
-           inkscape:connector-curvature="0"
-           style="fill-rule:evenodd" /><path
-           id="path656"
-           d="m 1383.3714,517.82712 -52.2509,0 0,76.33425 52.2509,0 z"
-           inkscape:connector-curvature="0"
-           style="fill-rule:evenodd" /><path
-           id="path658"
-           d="m 1331.1206,517.82712 -52.2509,0 0,76.33425 52.2509,0 z"
-           inkscape:connector-curvature="0"
-           style="fill:#bfbfbf;fill-opacity:1;fill-rule:evenodd" /><path
-           id="path662"
-           d="m 1074.8634,365.16958 0,76.3125 75.8437,0 75.8438,0 75.8438,0 75.8437,0 0,-76.3125 -75.8437,0 -75.8438,0 -75.8438,0 -75.8437,0 z"
-           inkscape:connector-curvature="0"
-           style="fill-rule:evenodd" /><path
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero"
-           inkscape:connector-curvature="0"
-           d="m 1033.9212,958.74317 5.0031,0 0,78.60393 -5.0031,0 z"
-           id="path7416" /><path
-           sodipodi:nodetypes="ccssccccc"
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#bfbfbf;fill-opacity:1;fill-rule:evenodd"
-           d="m 1637.3622,594.16536 c -0.8584,-1.84493 -1.6488,-3.73116 -2.5313,-5.5625 -3.1805,-6.60073 -6.5134,-13.11315 -10,-19.53125 -3.4866,-6.4181 -7.1232,-12.74277 -10.9062,-18.96875 -3.783,-6.22598 -7.7113,-12.35063 -11.7812,-18.375 -3.1903,-4.72223 -6.5448,-9.31309 -9.9062,-13.90625 l 0,0 0,76.34375 z"
-           id="path184" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#0000ff;fill-rule:evenodd"
-           d="m 1529.9247,594.16536 0,76.34375 0,76.3125 75.8438,0 72.125,0 c -4.5172,-54.15043 -18.5185,-105.5994 -40.4063,-152.65625 l -31.7187,0 -75.8438,0 z"
-           id="path208" /><path
-           sodipodi:nodetypes="csssscccc"
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd"
-           d="m 860.86211,517.82161 c -3.36141,4.59316 -6.71586,9.18402 -9.90614,13.90625 -4.06999,6.02437 -7.99825,12.14902 -11.78125,18.375 -3.783,6.22598 -7.41973,12.55065 -10.90625,18.96875 -3.48652,6.4181 -6.81944,12.93052 -10,19.53125 -0.88243,1.83134 -1.67284,3.71757 -2.53125,5.5625 l 45.12489,0 0,-76.34375 z"
-           id="path388" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#00ffff;fill-rule:evenodd"
-           d="m 923.1747,594.16681 0,76.34376 0,76.3125 75.84375,0 75.84375,0 0,-76.3125 0,-76.34376 -75.84375,0 -75.84375,0 z"
-           id="path516" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#00ff00;fill-rule:evenodd"
-           d="m 1074.8622,594.16681 0,76.34376 0,76.3125 75.8438,0 75.8437,0 0,-76.3125 0,-76.34376 -75.8437,0 -75.8438,0 z"
-           id="path518" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#ff00ff;fill-rule:evenodd"
-           d="m 1226.5497,594.16681 0,76.34376 0,76.3125 75.8438,0 75.8437,0 0,-76.3125 0,-76.34376 -75.8437,0 -75.8438,0 z"
-           id="path520" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#ff0000;fill-rule:evenodd"
-           d="m 1378.2372,594.16681 0,76.34376 0,76.3125 75.8437,0 75.8438,0 0,-76.3125 0,-76.34376 -75.8438,0 -75.8437,0 z"
-           id="path522" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#ffff00;fill-rule:evenodd"
-           d="m 923.16131,594.15586 0,76.34375 0,76.3125 -75.8438,0 -72.125,0 c 4.5172,-54.15043 18.5185,-105.5994 40.4063,-152.65625 l 31.7187,0 75.8438,0 z"
-           id="path524" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#808080;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.54100001;stroke-linecap:square"
-           d="m 1637.3622,975.79036 6.3437,0 0,-14.03125 c -2.0081,4.73267 -4.1808,9.38261 -6.3437,14.03125 z"
-           id="path174" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#808080;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.54100001;stroke-linecap:square"
-           d="m 1188.6262,823.14229 75.8471,0 0,76.32878 -75.8471,0 z"
-           id="path276" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#808080;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.54100001;stroke-linecap:square"
-           d="m 809.39347,961.75911 0,14.03125 6.34375,0 c -2.16293,-4.64864 -4.33557,-9.29858 -6.34375,-14.03125 z"
-           id="path376" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd"
-           d="m 775.30601,822.08167 c 0.22656,2.71383 0.3508,6.50867 0.625,9.20869 0.7732,7.61355 1.72314,15.15893 2.86871,22.65625 1.14557,7.49732 2.49155,14.94089 4,22.3125 1.50845,7.37161 3.20066,14.66984 5.0625,21.90625 0.11373,0.44202 0.25997,0.871 0.375,1.3125 1.7681,6.78634 3.64773,13.52897 5.71875,20.1875 2.20575,7.09172 4.58482,14.12496 7.125,21.0625 2.54018,6.93754 5.22864,13.78862 8.09375,20.5625 0.0673,0.15907 0.15129,0.30978 0.21875,0.46875 2.00818,4.73267 4.18082,9.38261 6.34375,14.03125 l 32.25,0 0,-76.3125 -0.0937,0 0,-77.39619 -38.5,0 z"
-           id="path406" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient4208-5);fill-rule:evenodd"
-           d="m 846.58411,822.80676 0,76.50746 0,76.47614 153.57979,0 0,-76.47614 0,-76.50746 -153.57979,0 z"
-           id="path532" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd"
-           d="m 1677.8438,822.08167 c -0.2266,2.71383 -0.3508,6.50867 -0.625,9.20869 -0.7732,7.61355 -1.7232,15.15893 -2.8687,22.65625 -1.1455,7.49732 -2.4916,14.94089 -4.0001,22.3125 -1.5085,7.37161 -3.2006,14.66984 -5.0625,21.90625 -0.1137,0.44202 -0.2599,0.871 -0.375,1.3125 -1.7681,6.78634 -3.6477,13.52897 -5.7187,20.1875 -2.2058,7.09172 -4.5848,14.12496 -7.125,21.0625 -2.5402,6.93754 -5.2286,13.78862 -8.0938,20.5625 -0.067,0.15907 -0.1512,0.30978 -0.2187,0.46875 -2.0082,4.73267 -4.1808,9.38261 -6.3438,14.03125 l -32.25,0 0,-76.3125 0.094,0 0,-77.39619 38.5,0 z"
-           id="path552" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient4246-6);fill-rule:evenodd"
-           d="m 999.7845,822.80676 0,76.50746 0,76.47614 52.9075,0 0,-76.47614 0,-76.50746 -52.9075,0 z"
-           id="path554" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient4250-7);fill-rule:evenodd"
-           d="m 1052.3912,822.80676 0,76.50746 0,76.47614 52.9074,0 0,-76.47614 0,-76.50746 -52.9074,0 z"
-           id="path556" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient4254-4);fill-rule:evenodd"
-           d="m 1103.8665,822.80676 0,76.50746 0,76.47614 52.9075,0 0,-76.47614 0,-76.50746 -52.9075,0 z"
-           id="path558" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient4258-5);fill-rule:evenodd"
-           d="m 1155.9075,822.80676 0,76.50746 0,76.47614 31.9032,0 0,-76.47614 0,-76.50746 -31.9032,0 z"
-           id="path560" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient4262-5);fill-rule:evenodd"
-           d="m 1187.2786,900.27989 0,37.76296 0,37.74751 31.7454,0 0,-37.74751 0,-37.76296 -31.7454,0 z"
-           id="path562" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient4266-1);fill-rule:evenodd"
-           d="m 1218.9226,900.27989 0,37.76296 0,37.74751 31.7453,0 0,-37.74751 0,-37.76296 -31.7453,0 z"
-           id="path564" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient4270-6);fill-rule:evenodd"
-           d="m 1250.2938,822.80676 0,76.50745 0,76.47615 31.7453,0 0,-76.47615 0,-76.50745 -31.7453,0 z"
-           id="path566" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient4283-0);fill-rule:evenodd"
-           d="m 1281.9709,822.80676 0,76.50745 0,76.47615 31.7453,0 0,-76.47615 0,-76.50745 -31.7453,0 z"
-           id="path574" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient4367-2);fill-rule:evenodd"
-           d="m 1313.7275,822.80676 0,76.50746 0,76.47614 20.5374,0 0,-76.47614 0,-76.50746 -20.5374,0 z"
-           id="path576" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient8765);fill-rule:evenodd"
-           d="m 1334.0228,822.81681 0,76.50242 0,76.47113 20.5374,0 0,-76.47113 0,-76.50242 -20.5374,0 z"
-           id="path578" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient8767);fill-rule:evenodd"
-           d="m 1354.4946,822.81681 0,76.50242 0,76.47113 20.5374,0 0,-76.47113 0,-76.50242 -20.5374,0 z"
-           id="path580" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient8769);fill-rule:evenodd"
-           d="m 1374.7899,822.80676 0,76.50745 0,76.47615 20.5374,0 0,-76.47615 0,-76.50745 -20.5374,0 z"
-           id="path582" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient8771);fill-rule:evenodd"
-           d="m 1395.2832,822.80676 0,76.50745 0,76.47615 20.5374,0 0,-76.47615 0,-76.50745 -20.5374,0 z"
-           id="path584" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient8773);fill-rule:evenodd"
-           d="m 1415.7868,822.81681 0,76.50242 0,76.47113 20.5374,0 0,-76.47113 0,-76.50242 -20.5374,0 z"
-           id="path586" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient8775);fill-rule:evenodd"
-           d="m 1436.0822,822.80676 0,76.50745 0,76.47615 20.5373,0 0,-76.47615 0,-76.50745 -20.5373,0 z"
-           id="path588" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:url(#linearGradient8777);fill-rule:evenodd"
-           d="m 1456.5754,822.80676 0,76.50745 0,76.47615 20.5374,0 0,-76.47615 0,-76.50745 -20.5374,0 z"
-           id="path590" /><g
-           style="display:inline"
-           transform="matrix(0.4489,0,0,1,1115.9798,257.61568)"
-           id="g592"><path
-             style="fill:url(#linearGradient8779);fill-rule:evenodd"
-             inkscape:connector-curvature="0"
-             d="m 947.47307,565.20113 0,76.50242 0,76.47113 20.53739,0 0,-76.47113 0,-76.50242 -20.53739,0 z"
-             id="path594" /><path
-             style="fill:url(#linearGradient8781);fill-rule:evenodd"
-             inkscape:connector-curvature="0"
-             d="m 967.94488,565.20113 0,76.50242 0,76.47113 20.53742,0 0,-76.47113 0,-76.50242 -20.53742,0 z"
-             id="path596" /><path
-             style="fill:url(#linearGradient8783);fill-rule:evenodd"
-             inkscape:connector-curvature="0"
-             d="m 988.24022,565.19108 0,76.50745 0,76.47615 20.53738,0 0,-76.47615 0,-76.50745 -20.53738,0 z"
-             id="path598" /><path
-             style="fill:url(#linearGradient8785);fill-rule:evenodd"
-             inkscape:connector-curvature="0"
-             d="m 1008.7335,565.19108 0,76.50745 0,76.47615 20.5374,0 0,-76.47615 0,-76.50745 -20.5374,0 z"
-             id="path600" /><path
-             style="fill:url(#linearGradient8787);fill-rule:evenodd"
-             inkscape:connector-curvature="0"
-             d="m 1029.2371,565.20113 0,76.50242 0,76.47113 20.5374,0 0,-76.47113 0,-76.50242 -20.5374,0 z"
-             id="path602" /><path
-             style="fill:url(#linearGradient8789);fill-rule:evenodd"
-             inkscape:connector-curvature="0"
-             d="m 1049.5325,565.19108 0,76.50745 0,76.47615 20.5373,0 0,-76.47615 0,-76.50745 -20.5373,0 z"
-             id="path604" /><path
-             style="fill:url(#linearGradient8791);fill-rule:evenodd"
-             inkscape:connector-curvature="0"
-             d="m 1070.0257,565.19108 0,76.50745 0,76.47615 20.5374,0 0,-76.47615 0,-76.50745 -20.5374,0 z"
-             id="path606" /></g><g
-           style="display:inline"
-           transform="matrix(0.4489,0,0,1,1051.7658,257.61568)"
-           id="g608"><path
-             style="fill:url(#linearGradient4364-8);fill-rule:evenodd"
-             inkscape:connector-curvature="0"
-             d="m 947.47307,565.20113 0,76.50242 0,76.47113 20.53739,0 0,-76.47113 0,-76.50242 -20.53739,0 z"
-             id="path610" /><path
-             style="fill:url(#linearGradient4361-3);fill-rule:evenodd"
-             inkscape:connector-curvature="0"
-             d="m 967.94488,565.20113 0,76.50242 0,76.47113 20.53742,0 0,-76.47113 0,-76.50242 -20.53742,0 z"
-             id="path612" /><path
-             style="fill:url(#linearGradient4358-6);fill-rule:evenodd"
-             inkscape:connector-curvature="0"
-             d="m 988.24022,565.19108 0,76.50745 0,76.47615 20.53738,0 0,-76.47615 0,-76.50745 -20.53738,0 z"
-             id="path614" /><path
-             style="fill:url(#linearGradient4355-1);fill-rule:evenodd"
-             inkscape:connector-curvature="0"
-             d="m 1008.7335,565.19108 0,76.50745 0,76.47615 20.5374,0 0,-76.47615 0,-76.50745 -20.5374,0 z"
-             id="path616" /><path
-             style="fill:url(#linearGradient4375-0);fill-rule:evenodd"
-             inkscape:connector-curvature="0"
-             d="m 1029.2371,565.20113 0,76.50242 0,76.47113 20.5374,0 0,-76.47113 0,-76.50242 -20.5374,0 z"
-             id="path618" /><path
-             style="fill:url(#linearGradient4377-6);fill-rule:evenodd"
-             inkscape:connector-curvature="0"
-             d="m 1049.5325,565.19108 0,76.50745 0,76.47615 20.5373,0 0,-76.47615 0,-76.50745 -20.5373,0 z"
-             id="path620" /><path
-             style="fill:url(#linearGradient4379-3);fill-rule:evenodd"
-             inkscape:connector-curvature="0"
-             d="m 1070.0257,565.19108 0,76.50745 0,76.47615 20.5374,0 0,-76.47615 0,-76.50745 -20.5374,0 z"
-             id="path622" /></g><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd"
-           d="m 1567.8617,746.81337 75.8471,0 0,76.32878 -75.8471,0 z"
-           id="path178" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd"
-           d="m 1492.0145,746.81337 75.8471,0 0,76.32878 -75.8471,0 z"
-           id="path200" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd"
-           d="m 1677.7997,823.13411 c 0.4123,-4.93866 0.8724,-9.86134 1.125,-14.84375 0.3913,-7.72029 0.5938,-15.49496 0.5938,-23.3125 0,-7.81754 -0.2025,-15.59221 -0.5938,-23.3125 -0.2526,-4.98241 -0.7127,-9.90509 -1.125,-14.84375 l -34.0938,0 0,76.3125 34.0938,0 z"
-           id="path206" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd"
-           d="m 1416.1675,746.81337 75.8471,0 0,76.32878 -75.8471,0 z"
-           id="path222" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd"
-           d="m 1340.3204,746.81337 75.847,0 0,76.32878 -75.847,0 z"
-           id="path240" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd"
-           d="m 1264.4733,746.81337 75.8471,0 0,76.32878 -75.8471,0 z"
-           id="path258" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.54100001;stroke-linecap:square"
-           d="m 1188.6262,746.81337 75.8471,0 0,76.32878 -75.8471,0 z"
-           id="path278" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd"
-           d="m 1112.7791,746.81337 75.8471,0 0,76.32878 -75.8471,0 z"
-           id="path298" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd"
-           d="m 1036.932,746.81337 75.8471,0 0,76.32878 -75.8471,0 z"
-           id="path318" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd"
-           d="m 961.08488,746.81337 75.84712,0 0,76.32878 -75.84712,0 z"
-           id="path336" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd"
-           d="m 885.23777,746.81337 75.84709,0 0,76.32878 -75.84709,0 z"
-           id="path356" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd"
-           d="m 809.39066,746.81337 75.84709,0 0,76.32878 -75.84709,0 z"
-           id="path380" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd"
-           d="m 775.29972,746.82161 c -0.4123,4.93866 -0.87244,9.86134 -1.125,14.84375 -0.39134,7.72029 -0.59375,15.49496 -0.59375,23.3125 0,7.81754 0.20241,15.59221 0.59375,23.3125 0.25256,4.98241 0.7127,9.90509 1.125,14.84375 l 34.09375,0 0,-76.3125 z"
-           id="path410" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.51400006;stroke-linecap:square"
-           d="m 1188.6296,784.96962 75.8437,0"
-           id="path526" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:none;stroke:#ffffff;stroke-width:4.53714228;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 809.39347,822.08167 -0.003,-75.2683"
-           id="path528" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:none;stroke:#ffffff;stroke-width:4.53714228;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 885.24077,823.14213 -0.003,-76.32878"
-           id="path530" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:none;stroke:#ffffff;stroke-width:4.53714228;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 961.08786,823.14213 -0.003,-76.32878"
-           id="path534" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:none;stroke:#ffffff;stroke-width:4.53714228;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 1036.9352,823.14213 0,-76.32878"
-           id="path536" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:none;stroke:#ffffff;stroke-width:4.53714228;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 1112.7821,823.14215 0,-76.32878"
-           id="path538" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:none;stroke:#ffffff;stroke-width:1.50999999"
-           d="m 1188.6294,823.14215 0,-76.32878"
-           id="path540" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:none;stroke:#ffffff;stroke-width:4.53714228;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 1340.3234,823.1422 0,-76.32878"
-           id="path542" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:none;stroke:#ffffff;stroke-width:4.53714228;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 1416.1707,823.1422 0,-76.32878"
-           id="path544" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:none;stroke:#ffffff;stroke-width:4.53714228;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 1492.0175,823.14215 0,-76.32878"
-           id="path546" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:none;stroke:#ffffff;stroke-width:4.53714228;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 1567.8648,823.14215 0,-76.32878"
-           id="path548" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:none;stroke:#ffffff;stroke-width:4.53714228;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 1643.7088,823.14215 0,-76.32878"
-           id="path550" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd;stroke:none;stroke-width:1.54100001;stroke-linecap:square"
-           d="m 1188.6296,670.46961 0,76.34376 0,76.31249 0,76.34376 75.8437,0 0,-76.34376 0,-76.31249 0,-76.34376 -75.8437,0 z"
-           id="path568" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.02476144;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 773.59242,784.97786 905.91458,0"
-           id="path570" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.53714228;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 1226.5514,670.98561 0,228.48401"
-           id="path572" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#cccccc;fill-rule:evenodd"
-           d="m 1378.2932,975.79982 151.1662,0 0,76.32878 -151.1662,0 z"
-           id="path236" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#999999;fill-rule:evenodd"
-           d="m 1226.5514,975.79982 151.7418,0 0,76.32878 -151.7418,0 z"
-           id="path274" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#666666;fill-rule:evenodd"
-           d="m 1073.9227,975.79982 152.6287,0 0,76.32878 -152.6287,0 z"
-           id="path314" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#333333;fill-rule:evenodd"
-           d="m 924.19202,975.79982 149.73068,0 0,76.32878 -149.73068,0 z"
-           id="path352" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#ffff00;fill-rule:evenodd"
-           d="m 1522.7537,1127.6636 c -170.0804,147.0108 -422.2492,147.031 -592.35314,0.047"
-           id="path506" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#ffffff;fill-rule:evenodd"
-           d="m 860.86222,1052.1341 c 0.9269,1.2666 1.77906,2.5872 2.71875,3.8438 4.34749,5.8132 8.822,11.5323 13.4375,17.125 2.66014,3.2233 5.47206,6.3211 8.21875,9.4687 2.01897,2.3137 3.96637,4.6969 6.03125,6.9688 4.87403,5.3626 9.87693,10.5956 15,15.7187 5.12307,5.1231 10.35612,10.126 15.71875,15 3.07988,2.7993 6.28106,5.4728 9.4375,8.1875 l 29.65625,0 38.625,0 0,-76.3125 -38.625,0 -75.84375,0 -24.375,0 z"
-           id="path508" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#000000;fill-rule:evenodd"
-           d="m 815.73722,975.79036 c 0.85841,1.84493 1.64882,3.73116 2.53125,5.5625 3.18056,6.60073 6.51348,13.11315 10,19.53124 3.48652,6.4181 7.12325,12.7428 10.90625,18.9688 3.783,6.2259 7.71126,12.3506 11.78125,18.375 3.19028,4.7222 6.54484,9.313 9.90625,13.9062 l 63.3298,0 0,-76.34374 z"
-           id="path510" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#ffffff;fill-rule:evenodd"
-           d="m 1453.8935,1052.1341 0,76.3125 38.125,0 29.6562,0 c 3.1564,-2.7147 6.3576,-5.3882 9.4375,-8.1875 5.3626,-4.874 10.5959,-9.8769 15.7187,-15 5.1228,-5.1231 10.1262,-10.3561 15,-15.7187 2.0651,-2.2719 4.0123,-4.6551 6.0313,-6.9688 2.7467,-3.1476 5.5588,-6.2454 8.2187,-9.4687 4.6158,-5.5927 9.0899,-11.3118 13.4376,-17.125 0.9394,-1.2566 1.7918,-2.5772 2.7187,-3.8438 l -24.375,0 -75.8437,0 -38.125,0 z"
-           id="path512" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#000000;fill-rule:evenodd"
-           d="m 999.74615,1052.1287 454.14735,0 0,76.3288 -454.14735,0 z"
-           id="path514" /><path
-           inkscape:connector-curvature="0"
-           style="display:inline;fill:#ffffff;fill-rule:evenodd"
-           d="m 1637.9142,975.79233 c -0.8584,1.84493 -1.6488,3.73116 -2.5312,5.5625 -3.1806,6.60073 -6.5135,13.11315 -10,19.53127 -3.4865,6.4181 -7.1233,12.7427 -10.9063,18.9687 -3.783,6.226 -7.7113,12.3507 -11.7812,18.375 -3.1903,4.7223 -6.5449,9.3131 -9.9063,13.9063 l -63.3298,0 0,-76.34377 z"
-           id="path806" /><path
-           id="path7401"
-           d="m 1187.1172,823.14215 0,-76.32878"
-           style="display:inline;fill:none;stroke:#ffffff;stroke-width:4.53714228;stroke-miterlimit:4;stroke-dasharray:none"
-           inkscape:connector-curvature="0" /><path
-           id="path7403"
-           d="m 1265.9857,823.1422 0,-76.32878"
-           style="display:inline;fill:none;stroke:#ffffff;stroke-width:4.53714228;stroke-miterlimit:4;stroke-dasharray:none"
-           inkscape:connector-curvature="0" /><path
-           id="path7405"
-           d="m 1188.6296,1128.4772 0,36.7624 0,36.7473 0,34.3209 c 0,0 18.6351,1.5328 37.9219,1.5328 19.2867,0 37.9218,-1.5328 37.9218,-1.5328 l 0,-34.3209 0,-36.7473 0,-36.7624 z"
-           style="display:inline;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.54100001;stroke-linecap:square"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccczccccc" /></g></g></g><g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="mapmap-logo"><g
-       id="g7474"
-       transform="matrix(0.16478613,0,0,0.16478613,102.93788,-153.57478)"
-       style="display:inline;fill:#272a36;fill-opacity:1"><path
-         inkscape:connector-curvature="0"
-         id="path4315"
-         style="display:inline;fill:#272a36;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 500.76199,1591.8744 61.28948,-64.0081 -61.28948,-65.8472 0,129.8553 z m 217.84386,-185.3853 0,242.739 -40.04575,0 0,-186.9094 -177.79811,186.9094 -40.04591,0 0,-242.739 40.04591,0 88.29239,93.1543 89.50572,-93.1543 40.04575,0" /><path
-         inkscape:connector-curvature="0"
-         id="path4317"
-         style="display:inline;fill:#272a36;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 858.47062,1445.3288 -19.41444,50.3721 40.35456,109.8324 -41.87103,0 -18.80603,-57.0311 -38.84117,100.7259 -43.08023,0 98.30139,-242.739 46.71543,0 98.30906,242.739 -43.38136,0 -78.28618,-203.8993" /><path
-         inkscape:connector-curvature="0"
-         id="path4319"
-         style="display:inline;fill:#272a36;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         d="m 1041.1237,1442.6001 43.9959,57.6471 36.7163,0 c 13.6543,0 24.8734,-13.0505 24.8734,-28.8143 0,-15.7885 -11.2191,-28.8328 -24.8734,-28.8328 l -80.7122,0 z m -2.7272,93.7489 0,112.876 -40.05188,0 0,-148.9778 41.87108,0 -41.87108,-57.6471 0,-36.111 123.49128,0 c 35.7883,0 64.9269,29.1386 64.9269,64.9438 0,35.7882 -29.1386,64.9161 -64.9269,64.9161 l -83.4394,0" /><path
-         d="m 1245.0151,1591.8744 61.2895,-64.0081 -61.2895,-65.8472 0,129.8553 z m 217.8439,-185.3853 0,242.739 -40.0458,0 0,-186.9094 -177.7981,186.9094 -40.0459,0 0,-242.739 40.0459,0 88.2924,93.1543 89.5057,-93.1543 40.0458,0"
-         style="display:inline;fill:#272a36;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4321"
-         inkscape:connector-curvature="0" /><path
-         d="m 1602.7238,1445.3288 -19.4145,50.3721 40.3546,109.8324 -41.871,0 -18.8061,-57.0311 -38.8411,100.7259 -43.0803,0 98.3014,-242.739 46.7154,0 98.3091,242.739 -43.3813,0 -78.2862,-203.8993"
-         style="display:inline;fill:#272a36;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4323"
-         inkscape:connector-curvature="0" /><path
-         d="m 1785.3768,1442.6001 43.9959,57.6471 36.7163,0 c 13.6544,0 24.8735,-13.0505 24.8735,-28.8143 0,-15.7885 -11.2191,-28.8328 -24.8735,-28.8328 l -80.7122,0 z m -2.7272,93.7489 0,112.876 -40.0519,0 0,-148.9778 41.8711,0 -41.8711,-57.6471 0,-36.111 123.4913,0 c 35.7883,0 64.9268,29.1386 64.9268,64.9438 0,35.7882 -29.1385,64.9161 -64.9268,64.9161 l -83.4394,0"
-         style="display:inline;fill:#272a36;fill-opacity:1;fill-rule:nonzero;stroke:none"
-         id="path4325"
-         inkscape:connector-curvature="0" /></g></g></svg>
\ No newline at end of file
diff --git a/src/mapmap/resources/images/test-signal/test-signal.svg b/src/mapmap/resources/images/test-signal/test-signal.svg
deleted file mode 100644
index 1ced9be..0000000
--- a/src/mapmap/resources/images/test-signal/test-signal.svg
+++ /dev/null
@@ -1,1354 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   x="0px"
-   y="0px"
-   width="600"
-   height="600"
-   viewBox="0 0 600 600"
-   enable-background="new 0 0 217 215"
-   xml:space="preserve"
-   id="svg2"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="test-signal.svg"><metadata
-     id="metadata562"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs560" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="776"
-     id="namedview558"
-     showgrid="false"
-     inkscape:zoom="0.89571167"
-     inkscape:cx="108.5"
-     inkscape:cy="310.35016"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" /><g
-     id="Calque_1"
-     transform="matrix(2.9671792,0,0,2.9671792,-20.508389,-12.408445)"><rect
-       x="176.854"
-       y="131.22301"
-       width="16.650999"
-       height="7.777"
-       id="rect5"
-       style="fill:none" /><rect
-       x="108.25"
-       y="131.22301"
-       width="16.650999"
-       height="7.777"
-       id="rect7"
-       style="fill:none" /><rect
-       x="125.401"
-       y="131.22301"
-       width="16.650999"
-       height="7.777"
-       id="rect9"
-       style="fill:none" /><rect
-       x="159.703"
-       y="131.22301"
-       width="16.650999"
-       height="7.777"
-       id="rect11"
-       style="fill:none" /><rect
-       x="91.098999"
-       y="131.22301"
-       width="16.650999"
-       height="7.777"
-       id="rect13"
-       style="fill:none" /><rect
-       x="56.797001"
-       y="131.22301"
-       width="16.65"
-       height="7.777"
-       id="rect15"
-       style="fill:none" /><rect
-       x="73.946999"
-       y="131.22301"
-       width="16.650999"
-       height="7.777"
-       id="rect17"
-       style="fill:none" /><rect
-       x="22.493999"
-       y="131.22301"
-       width="16.650999"
-       height="7.777"
-       id="rect19"
-       style="fill:none" /><rect
-       x="39.646"
-       y="131.22301"
-       width="16.650999"
-       height="7.777"
-       id="rect21"
-       style="fill:none" /><rect
-       x="142.55299"
-       y="131.22301"
-       width="16.65"
-       height="7.777"
-       id="rect23"
-       style="fill:none" /><path
-       d="m 107.999,8.333 c -42.046,0 -77.864,26.662 -91.475,64 h 182.949 c -13.61,-37.338 -49.428,-64 -91.474,-64 z"
-       id="path25"
-       inkscape:connector-curvature="0"
-       style="fill:#323642" /><path
-       d="m 107.999,8.333 c -42.046,0 -77.864,26.662 -91.475,64 h 182.949 c -13.61,-37.338 -49.428,-64 -91.474,-64 z"
-       id="path27"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" /><rect
-       x="108.25"
-       y="139"
-       width="16.650999"
-       height="8.8739996"
-       id="rect29"
-       style="fill:#323642" /><rect
-       x="125.401"
-       y="139"
-       width="16.650999"
-       height="8.8739996"
-       id="rect31"
-       style="fill:#ffffff" /><rect
-       x="142.55299"
-       y="139"
-       width="16.65"
-       height="8.8739996"
-       id="rect33" /><path
-       d="m 176.854,148.374 v 16.651 h 8.71 c 2.934,-3.807 5.589,-7.837 7.941,-12.061 v -4.591 h -16.651 z"
-       id="path35"
-       inkscape:connector-curvature="0"
-       style="fill:#323642" /><rect
-       x="176.854"
-       y="139"
-       width="16.650999"
-       height="8.8739996"
-       id="rect37" /><rect
-       x="22.493999"
-       y="139"
-       width="16.650999"
-       height="8.8739996"
-       id="rect39" /><rect
-       x="56.797001"
-       y="139"
-       width="16.65"
-       height="8.8739996"
-       id="rect41" /><rect
-       x="39.646"
-       y="139"
-       width="16.650999"
-       height="8.8739996"
-       id="rect43"
-       style="fill:#ffffff" /><rect
-       x="73.946999"
-       y="139"
-       width="16.650999"
-       height="8.8739996"
-       id="rect45"
-       style="fill:#ffffff" /><rect
-       x="91.098999"
-       y="139"
-       width="16.650999"
-       height="8.8739996"
-       id="rect47"
-       style="fill:#323642" /><rect
-       x="159.703"
-       y="139"
-       width="16.650999"
-       height="8.8739996"
-       id="rect49"
-       style="fill:#ffffff" /><path
-       d="m 176.854,174.868 c 2.965,-2.933 5.742,-6.052 8.312,-9.343 h -8.312 v 9.343 z"
-       id="path51"
-       inkscape:connector-curvature="0"
-       style="fill:#323642" /><path
-       d="m 125.401,182.677 v 16.651 h 9.601 c 2.389,-0.677 4.74,-1.441 7.051,-2.292 v -14.359 h -16.652 z"
-       id="path53"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" /><rect
-       x="108.25"
-       y="148.37399"
-       width="16.650999"
-       height="16.650999"
-       id="rect55"
-       style="fill:#323642" /><path
-       d="m 16.954,139 c 1.435,3.937 3.13,7.746 5.04,11.426 V 139 h -5.04 z"
-       id="path57"
-       inkscape:connector-curvature="0" /><path
-       d="m 199.903,139 h -5.897 v 13.06 c 2.27,-4.18 4.25,-8.539 5.897,-13.06 z"
-       id="path59"
-       inkscape:connector-curvature="0" /><rect
-       x="108.25"
-       y="165.52499"
-       width="16.650999"
-       height="16.650999"
-       id="rect61"
-       style="fill:#323642" /><path
-       d="m 159.703,165.525 v 16.651 h 8.876 c 2.71,-2.134 5.309,-4.402 7.775,-6.808 v -9.844 h -16.651 z"
-       id="path63"
-       inkscape:connector-curvature="0"
-       style="fill:#323642" /><path
-       d="m 142.553,182.677 v 14.165 c 5.837,-2.186 11.407,-4.916 16.65,-8.129 v -6.036 h -16.65 z"
-       id="path65"
-       inkscape:connector-curvature="0"
-       style="fill:#323642" /><path
-       d="m 159.703,188.397 c 2.85,-1.771 5.607,-3.674 8.252,-5.721 h -8.252 v 5.721 z"
-       id="path67"
-       inkscape:connector-curvature="0"
-       style="fill:#323642" /><rect
-       x="108.25"
-       y="182.677"
-       width="16.650999"
-       height="16.650999"
-       id="rect69"
-       style="fill:#1d1d1e" /><rect
-       x="125.401"
-       y="148.37399"
-       width="16.650999"
-       height="16.650999"
-       id="rect71"
-       style="fill:#323642" /><rect
-       x="142.55299"
-       y="165.52499"
-       width="16.65"
-       height="16.650999"
-       id="rect73"
-       style="fill:#323642" /><path
-       d="M 90.599,199.328 V 182.677 H 73.947 v 14.025 c 2.587,0.98 5.221,1.865 7.908,2.626 h 8.744 z"
-       id="path75"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" /><path
-       d="m 56.297,182.677 h -7.395 c 2.378,1.841 4.85,3.562 7.395,5.181 v -5.181 z"
-       id="path77"
-       inkscape:connector-curvature="0"
-       style="fill:#323642" /><path
-       d="m 73.447,182.677 h -16.65 v 5.495 c 5.236,3.285 10.807,6.083 16.65,8.335 v -13.83 z"
-       id="path79"
-       inkscape:connector-curvature="0"
-       style="fill:#323642" /><path
-       d="M 39.146,165.525 H 31.69 c 2.32,2.972 4.812,5.802 7.455,8.482 v -8.482 z"
-       id="path81"
-       inkscape:connector-curvature="0"
-       style="fill:#323642" /><rect
-       x="142.55299"
-       y="148.37399"
-       width="16.65"
-       height="16.650999"
-       id="rect83"
-       style="fill:#323642" /><path
-       d="m 83.759,199.828 c 2.249,0.588 4.53,1.098 6.84,1.525 v -1.525 h -6.84 z"
-       id="path85"
-       inkscape:connector-curvature="0"
-       style="fill:#323642" /><path
-       d="m 108.25,199.828 v 2.554 h -0.5 v -2.554 H 91.099 v 1.615 c 5.626,1.012 11.413,1.558 17.33,1.558 5.616,0 11.116,-0.49 16.473,-1.403 v -1.77 H 108.25 z"
-       id="path87"
-       inkscape:connector-curvature="0"
-       style="fill:#323642" /><rect
-       x="159.703"
-       y="148.37399"
-       width="16.650999"
-       height="16.650999"
-       id="rect89"
-       style="fill:#323642" /><path
-       d="m 48.278,182.177 h 8.019 V 165.526 H 39.646 v 8.984 c 2.723,2.72 5.604,5.282 8.632,7.667 z"
-       id="path91"
-       inkscape:connector-curvature="0"
-       style="fill:#323642" /><path
-       d="m 125.401,201.508 c 2.604,-0.458 5.17,-1.02 7.697,-1.68 h -7.697 v 1.68 z"
-       id="path93"
-       inkscape:connector-curvature="0"
-       style="fill:#323642" /><rect
-       x="73.946999"
-       y="148.37399"
-       width="16.650999"
-       height="16.650999"
-       id="rect95"
-       style="fill:#323642" /><rect
-       x="91.098999"
-       y="182.677"
-       width="16.650999"
-       height="16.650999"
-       id="rect97"
-       style="fill:#1d1d1e" /><rect
-       x="73.946999"
-       y="165.52499"
-       width="16.650999"
-       height="16.650999"
-       id="rect99"
-       style="fill:#323642" /><rect
-       x="91.098999"
-       y="165.52499"
-       width="16.650999"
-       height="16.650999"
-       id="rect101"
-       style="fill:#323642" /><rect
-       x="56.797001"
-       y="148.37399"
-       width="16.65"
-       height="16.650999"
-       id="rect103"
-       style="fill:#ffffff" /><path
-       d="M 39.146,165.025 V 148.374 H 22.494 v 3.004 c 2.56,4.802 5.5,9.368 8.799,13.647 h 7.853 z"
-       id="path105"
-       inkscape:connector-curvature="0"
-       style="fill:#323642" /><rect
-       x="91.098999"
-       y="148.37399"
-       width="16.650999"
-       height="16.650999"
-       id="rect107"
-       style="fill:#323642" /><rect
-       x="125.401"
-       y="165.52499"
-       width="16.650999"
-       height="16.650999"
-       id="rect109"
-       style="fill:#323642" /><rect
-       x="39.646"
-       y="148.37399"
-       width="16.650999"
-       height="16.650999"
-       id="rect111"
-       style="fill:#323642" /><rect
-       x="56.797001"
-       y="165.52499"
-       width="16.65"
-       height="16.650999"
-       id="rect113"
-       style="fill:#323642" /><polygon
-       points="90.599,131.223 90.599,139 91.099,139 91.099,131.223 107.75,131.223 107.75,139 108.25,139 108.25,131.223 124.901,131.223 124.901,139 125.401,139 125.401,131.223 142.053,131.223 142.053,139 142.553,139 142.553,131.223 159.203,131.223 159.203,139 159.703,139 159.703,131.223 176.354,131.223 176.354,139 176.854,139 176.854,131.223 193.506,131.223 193.506,139 194.006,139 194.006,128.168 193.506,128.168 193.506,130.723 176.854,130.723 176.854,128.168 176.354,128.168 176.354,130.723 159.703,130.723 159.703,128.168 159.203,128.168 159.203,130.723 142.553,130.723 142.553,128.168 142.053,128.168 142.053,130.723 125.401,130.723 125.401,128.168 124.901,128.168 124.901,130.723 108.25,130.723 108.25,128.168 107.75,128.168 107.75,130.723 91.099,130.723 91.099,128.168 90.599,128.168 90.599,130.723 73.947,130.723 73.947,128.168 73.447,128.168 73.447,130.723 56.797,130.723 56.797,128.168 56.297,128.168 56.297,130.723 39.646,130.723 39.646,128.168 39.146,128.168 39.146,130.723 22.494,130.723 22.494,128.168 21.994,128.168 21.994,139 22.494,139 22.494,131.223 39.146,131.223 39.146,139 39.646,139 39.646,131.223 56.297,131.223 56.297,139 56.797,139 56.797,131.223 73.447,131.223 73.447,139 73.947,139 73.947,131.223 "
-       id="polygon115"
-       style="fill:#ffffff" /><path
-       d="m 125.401,199.328 v -16.651 h 16.651 v 14.359 c 0.168,-0.062 0.332,-0.132 0.5,-0.194 v -14.165 h 16.65 v 6.036 c 0.168,-0.104 0.332,-0.211 0.5,-0.315 v -5.721 h 8.252 c 0.211,-0.163 0.414,-0.335 0.624,-0.5 h -8.876 v -16.651 h 16.651 v 9.844 c 0.169,-0.164 0.332,-0.335 0.5,-0.501 v -9.343 h 8.312 c 0.132,-0.168 0.268,-0.331 0.397,-0.5 h -8.71 v -16.651 h 16.651 v 4.591 c 0.168,-0.301 0.335,-0.603 0.5,-0.905 V 139 h -0.5 v 8.874 H 176.852 V 139 h -0.5 v 8.874 H 159.701 V 139 h -0.5 v 8.874 h -16.65 V 139 h -0.5 v 8.874 H 125.4 V 139 h -0.5 v 8.874 H 108.25 V 139 h -0.5 v 8.874 H 91.099 V 139 h -0.5 v 8.874 H 73.947 V 139 h -0.5 v 8.874 H 56.797 V 139 h -0.5 v 8.874 H 39.646 V 139 h -0.5 v 8.874 H 22.494 V 139 h -0.5 v 11.426 c 0.165,0.318 0.331,0.637 0.5,0.952 v -3.004 h 16.651 v 16.651 h -7.853 c 0.13,0.169 0.266,0.332 0.397,0.5 h 7.455 v 8.482 c 0.166,0.168 0.333,0.335 0.5,0.502 v -8.984 h 16.651 v 16.651 h -8.019 c 0.21,0.165 0.413,0.337 0.624,0.5 h 7.395 v 5.181 c 0.166,0.105 0.333,0.21 0.5,0.314 v -5.495 h 16.65 v 13.83 c 0.167,0.064 0.332,0.132 0.5,0.195 v -14.025 h 16.651 v 16.651 h -8.743 c 0.629,0.179 1.269,0.334 1.903,0.5 h 6.84 v 1.525 c 0.166,0.031 0.333,0.061 0.5,0.09 v -1.615 h 16.651 v 2.554 h 0.5 v -2.554 h 16.651 v 1.77 c 0.167,-0.028 0.333,-0.061 0.5,-0.09 v -1.68 h 7.697 c 0.635,-0.166 1.274,-0.321 1.903,-0.5 h -9.597 z m 34.302,-50.954 h 16.651 v 16.651 h -16.651 v -16.651 z m -17.15,0 h 16.65 v 16.651 h -16.65 v -16.651 z m 0,17.151 h 16.65 v 16.651 h -16.65 v -16.651 z m -17.152,-17.151 h 16.651 v 16.651 h -16.651 v -16.651 z m 0,17.151 h 16.651 v 16.651 h -16.651 v -16.651 z m -69.104,-0.5 H 39.646 v -16.651 h 16.651 v 16.651 z m 17.15,17.152 h -16.65 v -16.651 h 16.65 v 16.651 z m 0,-17.152 h -16.65 v -16.651 h 16.65 v 16.651 z m 17.152,17.152 H 73.947 v -16.651 h 16.651 v 16.651 z m 0,-17.152 H 73.947 v -16.651 h 16.651 v 16.651 z m 17.151,34.303 H 91.099 v -16.651 h 16.651 v 16.651 z m 0,-17.151 H 91.099 v -16.651 h 16.651 v 16.651 z m 0,-17.152 H 91.099 v -16.651 h 16.651 v 16.651 z m 17.151,34.303 H 108.25 v -16.651 h 16.651 v 16.651 z m 0,-17.151 H 108.25 v -16.651 h 16.651 v 16.651 z m 0,-17.152 H 108.25 v -16.651 h 16.651 v 16.651 z"
-       id="path117"
-       inkscape:connector-curvature="0"
-       style="fill:#ffffff" /><g
-       id="g119"><polygon
-         points="14.62,76.742 16.524,72.333 22.242,72.333 22.242,77.334 "
-         id="polygon121" /><rect
-         x="22.242001"
-         y="72.333"
-         width="5.7160001"
-         height="5.0009999"
-         id="rect123"
-         style="fill:#787878" /><rect
-         x="27.958"
-         y="72.333"
-         width="5.7189999"
-         height="5.0009999"
-         id="rect125" /><rect
-         x="33.676998"
-         y="72.333"
-         width="5.7160001"
-         height="5.0009999"
-         id="rect127"
-         style="fill:#787878" /><rect
-         x="39.393002"
-         y="72.333"
-         width="5.7179999"
-         height="5.0009999"
-         id="rect129" /><rect
-         x="45.110001"
-         y="72.333"
-         width="5.7160001"
-         height="5.0009999"
-         id="rect131"
-         style="fill:#787878" /><rect
-         x="50.826"
-         y="72.333"
-         width="5.7189999"
-         height="5.0009999"
-         id="rect133" /><rect
-         x="56.544998"
-         y="72.333"
-         width="5.7179999"
-         height="5.0009999"
-         id="rect135"
-         style="fill:#787878" /><rect
-         x="62.263"
-         y="72.333"
-         width="5.7160001"
-         height="5.0009999"
-         id="rect137" /><rect
-         x="67.978996"
-         y="72.333"
-         width="5.717"
-         height="5.0009999"
-         id="rect139"
-         style="fill:#787878" /><rect
-         x="73.695"
-         y="72.333"
-         width="5.717"
-         height="5.0009999"
-         id="rect141" /><rect
-         x="79.412003"
-         y="72.333"
-         width="5.7189999"
-         height="5.0009999"
-         id="rect143"
-         style="fill:#787878" /><rect
-         x="85.130997"
-         y="72.333"
-         width="5.717"
-         height="5.0009999"
-         id="rect145" /><rect
-         x="90.848"
-         y="72.333"
-         width="5.717"
-         height="5.0009999"
-         id="rect147"
-         style="fill:#787878" /><rect
-         x="96.564003"
-         y="72.333"
-         width="5.717"
-         height="5.0009999"
-         id="rect149" /><rect
-         x="102.281"
-         y="72.333"
-         width="5.7189999"
-         height="5.0009999"
-         id="rect151"
-         style="fill:#787878" /><rect
-         x="108"
-         y="72.333"
-         width="5.7160001"
-         height="5.0009999"
-         id="rect153" /><rect
-         x="113.716"
-         y="72.333"
-         width="5.7179999"
-         height="5.0009999"
-         id="rect155"
-         style="fill:#787878" /><rect
-         x="119.434"
-         y="72.333"
-         width="5.717"
-         height="5.0009999"
-         id="rect157" /><rect
-         x="125.15"
-         y="72.333"
-         width="5.717"
-         height="5.0009999"
-         id="rect159"
-         style="fill:#787878" /><rect
-         x="130.867"
-         y="72.333"
-         width="5.7189999"
-         height="5.0009999"
-         id="rect161" /><rect
-         x="136.586"
-         y="72.333"
-         width="5.7160001"
-         height="5.0009999"
-         id="rect163"
-         style="fill:#787878" /><rect
-         x="142.302"
-         y="72.333"
-         width="5.7179999"
-         height="5.0009999"
-         id="rect165" /><rect
-         x="148.02"
-         y="72.333"
-         width="5.7160001"
-         height="5.0009999"
-         id="rect167"
-         style="fill:#787878" /><rect
-         x="153.735"
-         y="72.333"
-         width="5.7189999"
-         height="5.0009999"
-         id="rect169" /><rect
-         x="159.45399"
-         y="72.333"
-         width="5.7160001"
-         height="5.0009999"
-         id="rect171"
-         style="fill:#787878" /><rect
-         x="165.17"
-         y="72.333"
-         width="5.7179999"
-         height="5.0009999"
-         id="rect173" /><rect
-         x="170.888"
-         y="72.333"
-         width="5.7160001"
-         height="5.0009999"
-         id="rect175"
-         style="fill:#787878" /><rect
-         x="176.604"
-         y="72.333"
-         width="5.7179999"
-         height="5.0009999"
-         id="rect177" /><rect
-         x="182.321"
-         y="72.333"
-         width="5.7179999"
-         height="5.0009999"
-         id="rect179"
-         style="fill:#787878" /><rect
-         x="188.039"
-         y="72.333"
-         width="5.717"
-         height="5.0009999"
-         id="rect181" /><polygon
-         points="193.756,77.334 193.756,72.333 199.474,72.333 201.56,77.334 "
-         id="polygon183"
-         style="fill:#787878" /></g><rect
-       x="42.830002"
-       y="76.741997"
-       width="32.584999"
-       height="32.583"
-       id="rect185"
-       style="fill:#4ee5d7" /><rect
-       x="75.415001"
-       y="76.741997"
-       width="32.584"
-       height="32.583"
-       id="rect187"
-       style="fill:#47f501" /><rect
-       x="107.999"
-       y="76.741997"
-       width="32.582001"
-       height="32.583"
-       id="rect189"
-       style="fill:#ef56ba" /><rect
-       x="140.58099"
-       y="76.741997"
-       width="32.584999"
-       height="32.583"
-       id="rect191"
-       style="fill:#f30000" /><g
-       id="g193"><path
-         d="m 10.248,109.325 h 0.072 c -0.043,-1.192 -0.072,-2.389 -0.072,-3.592 v 3.592 z"
-         id="path195"
-         inkscape:connector-curvature="0"
-         style="fill:#f4f100" /><path
-         d="M 42.83,76.742 H 14.62 c -2.841,9.16 -4.372,18.896 -4.372,28.991 0,1.203 0.029,2.399 0.072,3.592 H 42.83 V 76.742 z"
-         id="path197"
-         inkscape:connector-curvature="0"
-         style="fill:#f4f200" /></g><g
-       id="g199"><path
-         d="m 205.75,109.325 v -3.592 c 0,1.203 -0.029,2.399 -0.072,3.592 h 0.072 z"
-         id="path201"
-         inkscape:connector-curvature="0"
-         style="fill:#0027f6" /><path
-         d="m 173.166,76.742 v 32.583 h 32.512 c 0.043,-1.192 0.072,-2.389 0.072,-3.592 0,-10.095 -1.531,-19.831 -4.372,-28.991 h -28.212 z"
-         id="path203"
-         inkscape:connector-curvature="0"
-         style="fill:#042bfd" /></g><g
-       id="g205"><path
-         d="m 64.997,113.385 v 22.229 H 61.33 v -17.115 l -16.282,17.115 h -3.667 v -22.229 h 3.667 l 8.086,8.531 8.196,-8.531 h 3.667 z m -19.949,16.977 5.613,-5.862 -5.613,-6.029 v 11.891 z"
-         id="path207"
-         inkscape:connector-curvature="0"
-         style="fill:#323642" /><polygon
-         points="79.725,131.613 75.891,131.613 74.169,126.39 70.611,135.614 66.666,135.614 75.668,113.385 79.946,113.385 88.949,135.614 84.977,135.614 77.808,116.942 76.029,121.555 "
-         id="polygon209"
-         style="fill:#323642" /><path
-         d="m 93.729,125.278 v 10.336 h -3.668 v -13.643 h 3.834 l -3.834,-5.279 v -3.307 h 11.31 c 3.276,0 5.945,2.669 5.945,5.947 0,3.277 -2.669,5.945 -5.945,5.945 h -7.642 z m 0.25,-8.586 4.028,5.279 h 3.363 c 1.25,0 2.277,-1.195 2.277,-2.639 0,-1.446 -1.027,-2.641 -2.277,-2.641 h -7.391 z"
-         id="path211"
-         inkscape:connector-curvature="0"
-         style="fill:#323642" /><path
-         d="m 133.158,113.385 v 22.229 h -3.668 v -17.115 l -16.282,17.115 h -3.667 v -22.229 h 3.667 l 8.085,8.531 8.197,-8.531 h 3.668 z m -19.95,16.977 5.612,-5.862 -5.612,-6.029 v 11.891 z"
-         id="path213"
-         inkscape:connector-curvature="0"
-         style="fill:#323642" /><polygon
-         points="147.809,131.789 143.974,131.789 142.328,126.39 138.771,135.614 134.826,135.614 143.828,113.385 148.107,113.385 157.109,135.614 153.138,135.614 145.967,116.942 144.189,121.555 "
-         id="polygon215"
-         style="fill:#323642" /><path
-         d="m 161.891,125.278 v 10.336 h -3.668 v -13.643 h 3.834 l -3.834,-5.279 v -3.307 h 11.308 c 3.278,0 5.946,2.669 5.946,5.947 0,3.277 -2.668,5.945 -5.946,5.945 h -7.64 z m 0.249,-8.586 4.029,5.279 h 3.361 c 1.25,0 2.278,-1.195 2.278,-2.639 0,-1.446 -1.028,-2.641 -2.278,-2.641 h -7.39 z"
-         id="path217"
-         inkscape:connector-curvature="0"
-         style="fill:#323642" /></g><g
-       id="g219"><rect
-         x="56.797001"
-         y="148.37399"
-         width="8.533"
-         height="8.5349998"
-         id="rect221"
-         style="fill:#171717" /><rect
-         x="65.330002"
-         y="148.37399"
-         width="8.5349998"
-         height="8.5349998"
-         id="rect223"
-         style="fill:#1d1d1e" /><rect
-         x="73.864998"
-         y="148.37399"
-         width="8.533"
-         height="8.5349998"
-         id="rect225"
-         style="fill:#2d2d2d" /><rect
-         x="82.398003"
-         y="148.37399"
-         width="8.5340004"
-         height="8.5349998"
-         id="rect227"
-         style="fill:#4e5351" /><rect
-         x="90.932999"
-         y="148.37399"
-         width="8.533"
-         height="8.5349998"
-         id="rect229"
-         style="fill:#7c8680" /><rect
-         x="99.466003"
-         y="148.37399"
-         width="8.5340004"
-         height="8.5349998"
-         id="rect231"
-         style="fill:#a6afa9" /><rect
-         x="108"
-         y="148.37399"
-         width="8.533"
-         height="8.5349998"
-         id="rect233"
-         style="fill:#b3c0b9" /><rect
-         x="116.533"
-         y="148.37399"
-         width="8.5340004"
-         height="8.5349998"
-         id="rect235"
-         style="fill:#c1c8c5" /><rect
-         x="125.067"
-         y="148.37399"
-         width="8.5340004"
-         height="8.5349998"
-         id="rect237"
-         style="fill:#d3d9d3" /><rect
-         x="133.60201"
-         y="148.37399"
-         width="8.5340004"
-         height="8.5349998"
-         id="rect239"
-         style="fill:#dfe5de" /><rect
-         x="142.136"
-         y="148.37399"
-         width="8.533"
-         height="8.5349998"
-         id="rect241"
-         style="fill:#f6f9f1" /><rect
-         x="150.66901"
-         y="148.37399"
-         width="8.5340004"
-         height="8.5349998"
-         id="rect243"
-         style="fill:#fffffd" /></g><g
-       id="g245"><rect
-         x="73.864998"
-         y="156.909"
-         width="8.533"
-         height="8.1160002"
-         id="rect247"
-         style="fill:#e52f2f" /><rect
-         x="82.398003"
-         y="156.909"
-         width="8.5349998"
-         height="8.1160002"
-         id="rect249"
-         style="fill:#47a541" /><rect
-         x="90.933998"
-         y="156.909"
-         width="8.5319996"
-         height="8.1160002"
-         id="rect251"
-         style="fill:#34407e" /><rect
-         x="99.466003"
-         y="156.909"
-         width="8.533"
-         height="8.1160002"
-         id="rect253"
-         style="fill:#feff4a" /><rect
-         x="107.999"
-         y="156.909"
-         width="8.533"
-         height="8.1160002"
-         id="rect255"
-         style="fill:#33b4d8" /><rect
-         x="116.532"
-         y="156.909"
-         width="8.5340004"
-         height="8.1160002"
-         id="rect257"
-         style="fill:#e8317c" /><rect
-         x="125.066"
-         y="156.909"
-         width="8.533"
-         height="8.1160002"
-         id="rect259"
-         style="fill:#fea28d" /><rect
-         x="133.60001"
-         y="156.909"
-         width="8.5340004"
-         height="8.1160002"
-         id="rect261"
-         style="fill:#6b3f2e" /><rect
-         x="142.134"
-         y="156.909"
-         width="8.5340004"
-         height="8.1160002"
-         id="rect263"
-         style="fill:#ffffff" /><rect
-         x="150.668"
-         y="156.909"
-         width="8.5340004"
-         height="8.1160002"
-         id="rect265"
-         style="fill:#1d1d1e" /></g><line
-       stroke-miterlimit="10"
-       x1="24.566"
-       y1="68.775002"
-       x2="191.173"
-       y2="68.775002"
-       id="line267"
-       style="fill:none;stroke:#ffffff;stroke-width:0.5;stroke-miterlimit:10" /><linearGradient
-       id="SVGID_1_"
-       gradientUnits="userSpaceOnUse"
-       x1="91.098602"
-       y1="143.4375"
-       x2="124.9014"
-       y2="143.4375"><stop
-         offset="0"
-         style="stop-color:#FFFFFF"
-         id="stop270" /><stop
-         offset="1"
-         style="stop-color:#000000"
-         id="stop272" /></linearGradient><rect
-       x="91.098999"
-       y="139"
-       width="33.803001"
-       height="8.8739996"
-       id="rect274"
-       style="fill:url(#SVGID_1_)" /><g
-       id="g276"><line
-         stroke-miterlimit="10"
-         x1="142.28101"
-         y1="165.23399"
-         x2="159.453"
-         y2="182.438"
-         id="line278"
-         style="fill:none;stroke:#ffffff;stroke-width:0.5;stroke-miterlimit:10" /><line
-         stroke-miterlimit="10"
-         x1="142.26601"
-         y1="182.422"
-         x2="159.46899"
-         y2="165.25"
-         id="line280"
-         style="fill:none;stroke:#ffffff;stroke-width:0.5;stroke-miterlimit:10" /></g><g
-       id="g282"><line
-         stroke-miterlimit="10"
-         x1="56.743999"
-         y1="165.23399"
-         x2="73.916"
-         y2="182.438"
-         id="line284"
-         style="fill:none;stroke:#ffffff;stroke-width:0.5;stroke-miterlimit:10" /><line
-         stroke-miterlimit="10"
-         x1="56.729"
-         y1="182.422"
-         x2="73.931999"
-         y2="165.25"
-         id="line286"
-         style="fill:none;stroke:#ffffff;stroke-width:0.5;stroke-miterlimit:10" /></g><rect
-       x="91.098999"
-       y="166.875"
-       width="16.650999"
-       height="1.25"
-       id="rect288"
-       style="fill:#ffffff" /><rect
-       x="108.206"
-       y="166.875"
-       width="16.650999"
-       height="1.25"
-       id="rect290"
-       style="fill:#ffffff" /><rect
-       x="91.098999"
-       y="170.06599"
-       width="16.650999"
-       height="1.25"
-       id="rect292"
-       style="fill:#ffffff" /><rect
-       x="108.206"
-       y="170.06599"
-       width="16.650999"
-       height="1.25"
-       id="rect294"
-       style="fill:#ffffff" /><rect
-       x="91.098999"
-       y="173.258"
-       width="16.650999"
-       height="1.25"
-       id="rect296"
-       style="fill:#ffffff" /><rect
-       x="108.206"
-       y="173.258"
-       width="16.650999"
-       height="1.25"
-       id="rect298"
-       style="fill:#ffffff" /><rect
-       x="91.098999"
-       y="176.44901"
-       width="16.650999"
-       height="1.25"
-       id="rect300"
-       style="fill:#ffffff" /><rect
-       x="108.206"
-       y="176.44901"
-       width="16.650999"
-       height="1.25"
-       id="rect302"
-       style="fill:#ffffff" /><rect
-       x="91.098999"
-       y="179.64101"
-       width="16.650999"
-       height="1.25"
-       id="rect304"
-       style="fill:#ffffff" /><rect
-       x="108.206"
-       y="179.64101"
-       width="16.650999"
-       height="1.25"
-       id="rect306"
-       style="fill:#ffffff" /><g
-       id="g308"><polygon
-         points="74.073,169.926 86.308,182.161 88.077,182.161 74.073,168.156 "
-         id="polygon310"
-         style="fill:#ffffff" /><polygon
-         points="74.073,173.459 82.774,182.161 84.542,182.161 74.073,171.692 "
-         id="polygon312"
-         style="fill:#ffffff" /><polygon
-         points="74.073,176.996 79.238,182.161 81.007,182.161 74.073,175.229 "
-         id="polygon314"
-         style="fill:#ffffff" /><polygon
-         points="74.073,165.51 74.073,166.394 89.841,182.161 90.725,182.161 90.725,181.278 74.956,165.51 "
-         id="polygon316"
-         style="fill:#ffffff" /><polygon
-         points="74.073,180.532 75.703,182.161 77.478,182.161 74.073,178.757 "
-         id="polygon318"
-         style="fill:#ffffff" /><polygon
-         points="76.72,165.51 90.725,179.512 90.725,177.741 78.493,165.51 "
-         id="polygon320"
-         style="fill:#ffffff" /><polygon
-         points="87.327,165.51 90.725,168.908 90.725,167.141 89.094,165.51 "
-         id="polygon322"
-         style="fill:#ffffff" /><polygon
-         points="83.791,165.51 90.725,172.443 90.725,170.676 85.559,165.51 "
-         id="polygon324"
-         style="fill:#ffffff" /><polygon
-         points="80.254,165.51 90.725,175.98 90.725,174.208 82.025,165.51 "
-         id="polygon326"
-         style="fill:#ffffff" /></g><g
-       id="g328"><polygon
-         points="56.295,152.79 44.061,165.025 42.291,165.025 56.295,151.021 "
-         id="polygon330"
-         style="fill:#ffffff" /><polygon
-         points="56.295,156.323 47.594,165.025 45.826,165.025 56.295,154.557 "
-         id="polygon332"
-         style="fill:#ffffff" /><polygon
-         points="56.295,159.86 51.13,165.025 49.361,165.025 56.295,158.093 "
-         id="polygon334"
-         style="fill:#ffffff" /><polygon
-         points="56.295,148.374 56.295,149.258 40.527,165.025 39.644,165.025 39.644,164.143 55.412,148.374 "
-         id="polygon336"
-         style="fill:#ffffff" /><polygon
-         points="56.295,163.396 54.665,165.025 52.891,165.025 56.295,161.621 "
-         id="polygon338"
-         style="fill:#ffffff" /><polygon
-         points="53.648,148.374 39.644,162.376 39.644,160.605 51.875,148.374 "
-         id="polygon340"
-         style="fill:#ffffff" /><polygon
-         points="43.041,148.374 39.644,151.772 39.644,150.005 41.274,148.374 "
-         id="polygon342"
-         style="fill:#ffffff" /><polygon
-         points="46.577,148.374 39.644,155.308 39.644,153.54 44.81,148.374 "
-         id="polygon344"
-         style="fill:#ffffff" /><polygon
-         points="50.114,148.374 39.644,158.845 39.644,157.072 48.343,148.374 "
-         id="polygon346"
-         style="fill:#ffffff" /></g><g
-       id="g348"><polygon
-         points="125.401,174.292 133.317,182.208 134.493,182.208 125.401,173.118 "
-         id="polygon350"
-         style="fill:#ffffff" /><polygon
-         points="125.401,171.942 135.667,182.208 136.841,182.208 125.401,170.769 "
-         id="polygon352"
-         style="fill:#ffffff" /><polygon
-         points="125.401,169.595 138.013,182.208 139.188,182.208 125.401,168.419 "
-         id="polygon354"
-         style="fill:#ffffff" /><polygon
-         points="125.401,176.641 130.969,182.208 132.147,182.208 125.401,175.462 "
-         id="polygon356"
-         style="fill:#ffffff" /><polygon
-         points="125.401,167.249 140.36,182.208 141.534,182.208 125.401,166.075 "
-         id="polygon358"
-         style="fill:#ffffff" /><polygon
-         points="125.401,178.985 128.624,182.208 129.798,182.208 125.401,177.812 "
-         id="polygon360"
-         style="fill:#ffffff" /><polygon
-         points="125.401,181.332 126.277,182.208 127.451,182.208 125.401,180.158 "
-         id="polygon362"
-         style="fill:#ffffff" /><polygon
-         points="137.792,165.557 142.053,169.817 142.053,168.641 138.969,165.557 "
-         id="polygon364"
-         style="fill:#ffffff" /><polygon
-         points="135.445,165.557 142.053,172.164 142.053,170.988 136.621,165.557 "
-         id="polygon366"
-         style="fill:#ffffff" /><polygon
-         points="140.141,165.557 142.053,167.468 142.053,166.294 141.315,165.557 "
-         id="polygon368"
-         style="fill:#ffffff" /><polygon
-         points="126.054,165.557 142.053,181.553 142.053,180.377 127.232,165.557 "
-         id="polygon370"
-         style="fill:#ffffff" /><polygon
-         points="128.402,165.557 142.053,179.207 142.053,178.029 129.578,165.557 "
-         id="polygon372"
-         style="fill:#ffffff" /><polygon
-         points="133.101,165.557 142.053,174.509 142.053,173.335 134.274,165.557 "
-         id="polygon374"
-         style="fill:#ffffff" /><polygon
-         points="130.752,165.557 142.053,176.857 142.053,175.684 131.926,165.557 "
-         id="polygon376"
-         style="fill:#ffffff" /></g><g
-       id="g378"><polygon
-         points="176.355,157.109 168.439,165.025 167.264,165.025 176.355,155.936 "
-         id="polygon380"
-         style="fill:#ffffff" /><polygon
-         points="176.355,154.76 166.09,165.025 164.916,165.025 176.355,153.586 "
-         id="polygon382"
-         style="fill:#ffffff" /><polygon
-         points="176.355,152.412 163.744,165.025 162.568,165.025 176.355,151.236 "
-         id="polygon384"
-         style="fill:#ffffff" /><polygon
-         points="176.355,159.458 170.788,165.025 169.609,165.025 176.355,158.279 "
-         id="polygon386"
-         style="fill:#ffffff" /><polygon
-         points="176.355,150.066 161.396,165.025 160.223,165.025 176.355,148.893 "
-         id="polygon388"
-         style="fill:#ffffff" /><polygon
-         points="176.355,161.803 173.133,165.025 171.959,165.025 176.355,160.629 "
-         id="polygon390"
-         style="fill:#ffffff" /><polygon
-         points="176.355,164.149 175.479,165.025 174.306,165.025 176.355,162.976 "
-         id="polygon392"
-         style="fill:#ffffff" /><polygon
-         points="163.965,148.374 159.704,152.635 159.704,151.458 162.788,148.374 "
-         id="polygon394"
-         style="fill:#ffffff" /><polygon
-         points="166.312,148.374 159.704,154.981 159.704,153.806 165.136,148.374 "
-         id="polygon396"
-         style="fill:#ffffff" /><polygon
-         points="161.616,148.374 159.704,150.285 159.704,149.111 160.441,148.374 "
-         id="polygon398"
-         style="fill:#ffffff" /><polygon
-         points="175.703,148.374 159.704,164.37 159.704,163.194 174.524,148.374 "
-         id="polygon400"
-         style="fill:#ffffff" /><polygon
-         points="173.354,148.374 159.704,162.024 159.704,160.847 172.179,148.374 "
-         id="polygon402"
-         style="fill:#ffffff" /><polygon
-         points="168.656,148.374 159.704,157.326 159.704,156.152 167.482,148.374 "
-         id="polygon404"
-         style="fill:#ffffff" /><polygon
-         points="171.005,148.374 159.704,159.675 159.704,158.501 169.831,148.374 "
-         id="polygon406"
-         style="fill:#ffffff" /></g><circle
-       stroke-miterlimit="10"
-       cx="108.371"
-       cy="105.584"
-       r="97.25"
-       id="circle408"
-       sodipodi:cx="108.371"
-       sodipodi:cy="105.584"
-       sodipodi:rx="97.25"
-       sodipodi:ry="97.25"
-       style="fill:none;stroke:#000000;stroke-width:3;stroke-miterlimit:10"
-       d="m 205.621,105.584 c 0,53.70969 -43.54031,97.25 -97.25,97.25 -53.70969,0 -97.249998,-43.54031 -97.249998,-97.25 0,-53.709692 43.540308,-97.2500004 97.249998,-97.2500004 53.70969,0 97.25,43.5403084 97.25,97.2500004 z" /><rect
-       x="18.327999"
-       y="69.260002"
-       width="181.146"
-       height="1.779"
-       id="rect410" /></g><g
-     id="Calque_3"
-     transform="matrix(2.9671792,0,0,2.9671792,-20.508389,-12.408445)"><path
-       stroke-miterlimit="10"
-       d="m 25.022,66.664 c 14.983,-31.807 47.359,-52.662 82.977,-52.662 35.618,0 67.993,20.855 82.977,52.662 H 25.022 z"
-       id="path413"
-       inkscape:connector-curvature="0"
-       style="stroke:#000000;stroke-width:3;stroke-miterlimit:10" /></g><g
-     id="Calque_2"
-     transform="matrix(2.9671792,0,0,2.9671792,-20.508389,-12.408445)"><g
-       id="g416"><rect
-         x="88.544998"
-         y="50.411999"
-         stroke-miterlimit="10"
-         width="12.535"
-         height="12.536"
-         id="rect418"
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:0.61110002;stroke-miterlimit:10" /><g
-         id="g420"><rect
-           x="88.544998"
-           y="50.411999"
-           width="2.5079999"
-           height="12.536"
-           id="rect422"
-           style="fill:#1d1d1e" /><rect
-           x="93.560997"
-           y="50.411999"
-           width="2.506"
-           height="12.536"
-           id="rect424"
-           style="fill:#1d1d1e" /><rect
-           x="98.573997"
-           y="50.411999"
-           width="2.506"
-           height="12.536"
-           id="rect426"
-           style="fill:#1d1d1e" /></g><rect
-         x="103.651"
-         y="50.411999"
-         stroke-miterlimit="10"
-         width="12.535"
-         height="12.536"
-         id="rect428"
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:0.61110002;stroke-miterlimit:10" /><g
-         id="g430"><rect
-           x="103.651"
-           y="60.438999"
-           width="12.535"
-           height="2.5090001"
-           id="rect432"
-           style="fill:#1d1d1e" /><rect
-           x="103.651"
-           y="55.426998"
-           width="12.535"
-           height="2.507"
-           id="rect434"
-           style="fill:#1d1d1e" /><rect
-           x="103.651"
-           y="50.411999"
-           width="12.535"
-           height="2.5079999"
-           id="rect436"
-           style="fill:#1d1d1e" /></g><g
-         id="g438"><rect
-           x="121.528"
-           y="50.411999"
-           transform="matrix(-0.7071,-0.7071,0.7071,-0.7071,178.081,187.1229)"
-           stroke-miterlimit="10"
-           width="12.535"
-           height="12.535"
-           id="rect440"
-           style="fill:#ffffff;stroke:#ffffff;stroke-width:0.61110002;stroke-miterlimit:10" /><g
-           id="g442"><rect
-             x="130.086"
-             y="53.958"
-             transform="matrix(-0.7073,-0.7069,0.7069,-0.7073,181.6629,195.6681)"
-             width="2.507"
-             height="12.535"
-             id="rect444"
-             style="fill:#1d1d1e" /><rect
-             x="126.541"
-             y="50.412998"
-             transform="matrix(-0.7073,-0.7069,0.7069,-0.7073,178.1157,187.1096)"
-             width="2.507"
-             height="12.535"
-             id="rect446"
-             style="fill:#1d1d1e" /><rect
-             x="122.996"
-             y="46.867001"
-             transform="matrix(-0.7071,-0.7071,0.7071,-0.7071,174.5347,178.5632)"
-             width="2.507"
-             height="12.535"
-             id="rect448"
-             style="fill:#1d1d1e" /></g></g></g><g
-       id="g450"><rect
-         x="88.544998"
-         y="35.446999"
-         stroke-miterlimit="10"
-         width="9.8339996"
-         height="9.8339996"
-         id="rect452"
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:0.38190001;stroke-miterlimit:10" /><g
-         id="g454"><rect
-           x="88.544998"
-           y="35.446999"
-           width="1.967"
-           height="9.8339996"
-           id="rect456"
-           style="fill:#1d1d1e" /><rect
-           x="92.478996"
-           y="35.446999"
-           width="1.967"
-           height="9.8339996"
-           id="rect458"
-           style="fill:#1d1d1e" /><rect
-           x="96.412003"
-           y="35.446999"
-           width="1.967"
-           height="9.8339996"
-           id="rect460"
-           style="fill:#1d1d1e" /></g><rect
-         x="100.396"
-         y="35.446999"
-         stroke-miterlimit="10"
-         width="9.8339996"
-         height="9.8339996"
-         id="rect462"
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:0.38190001;stroke-miterlimit:10" /><g
-         id="g464"><rect
-           x="100.396"
-           y="43.314999"
-           width="9.8339996"
-           height="1.966"
-           id="rect466"
-           style="fill:#1d1d1e" /><rect
-           x="100.396"
-           y="39.381001"
-           width="9.8339996"
-           height="1.9680001"
-           id="rect468"
-           style="fill:#1d1d1e" /><rect
-           x="100.396"
-           y="35.446999"
-           width="9.8339996"
-           height="1.967"
-           id="rect470"
-           style="fill:#1d1d1e" /></g><g
-         id="g472"><rect
-           x="114.422"
-           y="35.446999"
-           transform="matrix(-0.7071,-0.7072,0.7072,-0.7071,175.1744,153.2953)"
-           stroke-miterlimit="10"
-           width="9.8339996"
-           height="9.8339996"
-           id="rect474"
-           style="fill:#ffffff;stroke:#ffffff;stroke-width:0.38190001;stroke-miterlimit:10" /><g
-           id="g476"><rect
-             x="121.136"
-             y="38.229"
-             transform="matrix(-0.7074,-0.7069,0.7069,-0.7074,178.0034,159.9868)"
-             width="1.967"
-             height="9.8339996"
-             id="rect478"
-             style="fill:#1d1d1e" /><rect
-             x="118.354"
-             y="35.448002"
-             transform="matrix(-0.7066,-0.7076,0.7076,-0.7066,175.1014,153.3299)"
-             width="1.9680001"
-             height="9.8330002"
-             id="rect480"
-             style="fill:#1d1d1e" /><rect
-             x="115.574"
-             y="32.666"
-             transform="matrix(-0.7069,-0.7074,0.7074,-0.7069,172.3623,146.5953)"
-             width="1.966"
-             height="9.8339996"
-             id="rect482"
-             style="fill:#1d1d1e" /></g></g></g><g
-       id="g484"><rect
-         x="88.544998"
-         y="22.992001"
-         stroke-miterlimit="10"
-         width="7.7119999"
-         height="7.7140002"
-         id="rect486"
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:0.38190001;stroke-miterlimit:10" /><g
-         id="g488"><rect
-           x="88.544998"
-           y="22.992001"
-           width="1.543"
-           height="7.7140002"
-           id="rect490"
-           style="fill:#1d1d1e" /><rect
-           x="91.630997"
-           y="22.992001"
-           width="1.541"
-           height="7.7140002"
-           id="rect492"
-           style="fill:#1d1d1e" /><rect
-           x="94.714996"
-           y="22.992001"
-           width="1.5420001"
-           height="7.7140002"
-           id="rect494"
-           style="fill:#1d1d1e" /></g><rect
-         x="97.839996"
-         y="22.992001"
-         stroke-miterlimit="10"
-         width="7.7129998"
-         height="7.7140002"
-         id="rect496"
-         style="fill:#ffffff;stroke:#ffffff;stroke-width:0.38190001;stroke-miterlimit:10" /><g
-         id="g498"><rect
-           x="97.839996"
-           y="29.163"
-           width="7.7129998"
-           height="1.543"
-           id="rect500"
-           style="fill:#1d1d1e" /><rect
-           x="97.839996"
-           y="26.077"
-           width="7.7129998"
-           height="1.543"
-           id="rect502"
-           style="fill:#1d1d1e" /><rect
-           x="97.839996"
-           y="22.992001"
-           width="7.7129998"
-           height="1.543"
-           id="rect504"
-           style="fill:#1d1d1e" /></g><g
-         id="g506"><rect
-           x="108.838"
-           y="22.993"
-           transform="matrix(-0.7071,-0.7071,0.7071,-0.7071,173.3964,125.5204)"
-           stroke-miterlimit="10"
-           width="7.7129998"
-           height="7.7119999"
-           id="rect508"
-           style="fill:#ffffff;stroke:#ffffff;stroke-width:0.38190001;stroke-miterlimit:10" /><g
-           id="g510"><rect
-             x="114.105"
-             y="25.174"
-             transform="matrix(-0.7065,-0.7077,0.7077,-0.7065,175.4874,130.8428)"
-             width="1.543"
-             height="7.7129998"
-             id="rect512"
-             style="fill:#1d1d1e" /><rect
-             x="111.924"
-             y="22.993"
-             transform="matrix(-0.7071,-0.7071,0.7071,-0.7071,173.3969,125.5216)"
-             width="1.543"
-             height="7.7119999"
-             id="rect514"
-             style="fill:#1d1d1e" /><rect
-             x="109.742"
-             y="20.811001"
-             transform="matrix(-0.7077,-0.7065,0.7065,-0.7077,171.3008,120.2003)"
-             width="1.543"
-             height="7.7129998"
-             id="rect516"
-             style="fill:#1d1d1e" /></g></g></g><g
-       id="g518"><rect
-         x="49.964001"
-         y="62.919998"
-         width="20.844"
-         height="0.56199998"
-         id="rect520"
-         style="fill:#ffffff" /><rect
-         x="49.964001"
-         y="59.859001"
-         width="20.844"
-         height="1.12"
-         id="rect522"
-         style="fill:#ffffff" /><rect
-         x="49.964001"
-         y="56.797001"
-         width="20.844"
-         height="1.681"
-         id="rect524"
-         style="fill:#ffffff" /><rect
-         x="49.964001"
-         y="53.736"
-         width="20.844"
-         height="2.2409999"
-         id="rect526"
-         style="fill:#ffffff" /><rect
-         x="49.964001"
-         y="50.113998"
-         width="20.844"
-         height="2.8010001"
-         id="rect528"
-         style="fill:#ffffff" /><rect
-         x="82.891998"
-         y="42.358002"
-         width="1.119"
-         height="20.843"
-         id="rect530"
-         style="fill:#ffffff" /><rect
-         x="79.829002"
-         y="42.358002"
-         width="1.681"
-         height="20.843"
-         id="rect532"
-         style="fill:#ffffff" /><rect
-         x="76.766998"
-         y="42.358002"
-         width="2.2420001"
-         height="20.843"
-         id="rect534"
-         style="fill:#ffffff" /><rect
-         x="73.146004"
-         y="42.358002"
-         width="2.8010001"
-         height="20.843"
-         id="rect536"
-         style="fill:#ffffff" /></g><g
-       id="g538"><rect
-         x="154.646"
-         y="62.919998"
-         width="20.844"
-         height="0.56199998"
-         id="rect540"
-         style="fill:#ffffff" /><rect
-         x="154.646"
-         y="59.859001"
-         width="20.844"
-         height="1.12"
-         id="rect542"
-         style="fill:#ffffff" /><rect
-         x="154.646"
-         y="56.797001"
-         width="20.844"
-         height="1.681"
-         id="rect544"
-         style="fill:#ffffff" /><rect
-         x="154.646"
-         y="53.736"
-         width="20.844"
-         height="2.2409999"
-         id="rect546"
-         style="fill:#ffffff" /><rect
-         x="154.646"
-         y="50.113998"
-         width="20.844"
-         height="2.8010001"
-         id="rect548"
-         style="fill:#ffffff" /><rect
-         x="141.44299"
-         y="42.358002"
-         width="1.119"
-         height="20.843"
-         id="rect550"
-         style="fill:#ffffff" /><rect
-         x="143.944"
-         y="42.358002"
-         width="1.681"
-         height="20.843"
-         id="rect552"
-         style="fill:#ffffff" /><rect
-         x="146.44501"
-         y="42.358002"
-         width="2.2420001"
-         height="20.843"
-         id="rect554"
-         style="fill:#ffffff" /><rect
-         x="149.508"
-         y="42.358002"
-         width="2.8010001"
-         height="20.843"
-         id="rect556"
-         style="fill:#ffffff" /></g></g></svg>
\ No newline at end of file
diff --git a/src/mapmap/Ellipse.cpp b/src/shape/Ellipse.cpp
similarity index 100%
rename from src/mapmap/Ellipse.cpp
rename to src/shape/Ellipse.cpp
diff --git a/src/mapmap/Ellipse.h b/src/shape/Ellipse.h
similarity index 100%
rename from src/mapmap/Ellipse.h
rename to src/shape/Ellipse.h
diff --git a/src/mapmap/Mesh.cpp b/src/shape/Mesh.cpp
similarity index 100%
rename from src/mapmap/Mesh.cpp
rename to src/shape/Mesh.cpp
diff --git a/src/mapmap/Mesh.h b/src/shape/Mesh.h
similarity index 100%
rename from src/mapmap/Mesh.h
rename to src/shape/Mesh.h
diff --git a/src/mapmap/Polygon.cpp b/src/shape/Polygon.cpp
similarity index 100%
rename from src/mapmap/Polygon.cpp
rename to src/shape/Polygon.cpp
diff --git a/src/mapmap/Polygon.h b/src/shape/Polygon.h
similarity index 100%
rename from src/mapmap/Polygon.h
rename to src/shape/Polygon.h
diff --git a/src/mapmap/Quad.h b/src/shape/Quad.h
similarity index 100%
rename from src/mapmap/Quad.h
rename to src/shape/Quad.h
diff --git a/src/mapmap/Shape.cpp b/src/shape/Shape.cpp
similarity index 100%
rename from src/mapmap/Shape.cpp
rename to src/shape/Shape.cpp
diff --git a/src/mapmap/Shape.h b/src/shape/Shape.h
similarity index 100%
rename from src/mapmap/Shape.h
rename to src/shape/Shape.h
diff --git a/src/mapmap/Shapes.h b/src/shape/Shapes.h
similarity index 100%
rename from src/mapmap/Shapes.h
rename to src/shape/Shapes.h
diff --git a/src/mapmap/Triangle.h b/src/shape/Triangle.h
similarity index 100%
rename from src/mapmap/Triangle.h
rename to src/shape/Triangle.h
diff --git a/src/shape/shape.pri b/src/shape/shape.pri
new file mode 100644
index 0000000..9a2b34a
--- /dev/null
+++ b/src/shape/shape.pri
@@ -0,0 +1,15 @@
+
+include(../src.pri)
+
+HEADERS += $$PWD/Ellipse.h \
+    $$PWD/Mesh.h \
+    $$PWD/Polygon.h \
+    $$PWD/Quad.h \
+    $$PWD/Shape.h \
+    $$PWD/Shapes.h \
+    $$PWD/Triangle.h
+
+SOURCES += $$PWD/Ellipse.cpp \
+    $$PWD/Mesh.cpp \
+    $$PWD/Polygon.cpp \
+    $$PWD/Shape.cpp
diff --git a/src/src.pri b/src/src.pri
new file mode 100644
index 0000000..28f064f
--- /dev/null
+++ b/src/src.pri
@@ -0,0 +1,47 @@
+QT += gui opengl xml core network
+greaterThan(QT_MAJOR_VERSION, 4) {
+  QT -= gui # using widgets instead gui in Qt5
+  QT += widgets multimedia
+}
+
+#Includes common configuration for all subdirectory .pro files.
+INCLUDEPATH += $$PWD/core \
+    $$PWD/shape \
+    $$PWD/gui \
+    $$PWD/control \
+    $$PWD/app
+
+#Linux-specific:
+unix:!macx {
+  DEFINES += UNIX
+  CONFIG += link_pkgconfig
+  INCLUDE_PATH +=
+  PKGCONFIG += \
+    gstreamer-1.0 gstreamer-base-1.0 gstreamer-app-1.0 gstreamer-pbutils-1.0 \
+    liblo \
+    gl x11
+  QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-result -Wno-unused-parameter \
+                            -Wno-unused-variable -Wno-switch -Wno-comment \
+                            -Wno-unused-but-set-variable
+  QMAKE_CXXFLAGS += -DHAVE_OSC
+}
+
+# Windows-specific:
+win32 {
+  INCLUDEPATH += $${GST_HOME}/lib/gstreamer-1.0/include \
+    $${GST_HOME}/include/glib-2.0 \
+    $${GST_HOME}/lib/glib-2.0/include \
+    $${GST_HOME}/include/gstreamer-1.0
+
+  LIBS += $${GST_HOME}/lib/gstapp-1.0.lib \
+    $${GST_HOME}/lib/gstbase-1.0.lib \
+    $${GST_HOME}/lib/gstpbutils-1.0.lib \
+    $${GST_HOME}/lib/gstreamer-1.0.lib \
+    $${GST_HOME}/lib/gobject-2.0.lib \
+    $${GST_HOME}/lib/glib-2.0.lib \
+    -lopengl32
+
+  QMAKE_CXXFLAGS += -D_USE_MATH_DEFINES
+}
+
+
diff --git a/src/tests/TestMaths.cpp b/tests/TestMaths.cpp
similarity index 100%
rename from src/tests/TestMaths.cpp
rename to tests/TestMaths.cpp
diff --git a/src/tests/TestMaths.h b/tests/TestMaths.h
similarity index 100%
rename from src/tests/TestMaths.h
rename to tests/TestMaths.h
diff --git a/src/tests/tests.pro b/tests/tests.pro
similarity index 82%
rename from src/tests/tests.pro
rename to tests/tests.pro
index b923a21..6919f10 100644
--- a/src/tests/tests.pro
+++ b/tests/tests.pro
@@ -12,5 +12,5 @@ SOURCES = TestMaths.cpp
 
 HEADERS = TestMaths.h
 
-INCLUDEPATH += $$PWD/../mapmap/
+INCLUDEPATH += $$PWD/../src/
 
diff --git a/src/mapmap/translations/mapmap_en.ts b/translations/mapmap_en.ts
similarity index 100%
rename from src/mapmap/translations/mapmap_en.ts
rename to translations/mapmap_en.ts
diff --git a/src/mapmap/translations/mapmap_fr.ts b/translations/mapmap_fr.ts
similarity index 100%
rename from src/mapmap/translations/mapmap_fr.ts
rename to translations/mapmap_fr.ts
diff --git a/src/mapmap/translations/translation.qrc b/translations/translation.qrc
similarity index 100%
rename from src/mapmap/translations/translation.qrc
rename to translations/translation.qrc