diff --git a/zenmap/install_scripts/macosx/zenmap.bundle b/zenmap/install_scripts/macosx/zenmap.bundle
index 08fff60f0..78845a74a 100644
--- a/zenmap/install_scripts/macosx/zenmap.bundle
+++ b/zenmap/install_scripts/macosx/zenmap.bundle
@@ -79,13 +79,16 @@
     ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so
   </binary>
 
-  <!-- Python modules other than tnese are grabbed with get_deps.py -->
+  <!-- Python modules other than these are grabbed with get_deps.py -->
   <binary>
     ${prefix}/lib/python&PYVER;/site-packages/gi/*.so
   </binary>
   <binary>
     ${prefix}/lib/python&PYVER;/site-packages/cairo/*.so
   </binary>
+  <data>
+    ${prefix}/lib/python&PYVER;/site-packages/zenmapCore/data
+  </data>
 
 &pyreqs;
 
diff --git a/zenmap/pyproject.toml b/zenmap/pyproject.toml
index 7b851d675..0a2e3f5d7 100644
--- a/zenmap/pyproject.toml
+++ b/zenmap/pyproject.toml
@@ -26,6 +26,12 @@ zenmap = "zenmapGUI.App:run"
 [tool.setuptools]
 packages = [
 "zenmapCore",
+"zenmapCore.data.config",
+"zenmapCore.data.docs",
+"zenmapCore.data.locale",
+"zenmapCore.data.misc",
+"zenmapCore.data.pixmaps",
+"zenmapCore.data.pixmaps.radialnet",
 "zenmapGUI",
 "zenmapGUI.higwidgets",
 "radialnet",
@@ -33,16 +39,15 @@ packages = [
 "radialnet.core",
 "radialnet.gui",
 "radialnet.util",
-"share",
 ]
 
 [tool.setuptools.dynamic]
 version = {attr = "zenmapCore.Version.VERSION"}
 
 [tool.setuptools.package-data]
-"share.zenmap.pixmaps" = ["*.gif", "*.png"]
-"share.zenmap.pixmaps.radialnet" = ["*.png"]
-"share.zenmap.locale" = ["*.mo"]
-"share.zenmap.config" = ["zenmap.conf", "scan_profile.usp", "zenmap_version"]
-"share.zenmap.docs" = ["*.html"]
-"share.zenmap.misc" = ["*.xml"]
+"zenmapCore.data.pixmaps" = ["*.gif", "*.png"]
+"zenmapCore.data.pixmaps.radialnet" = ["*.png"]
+"zenmapCore.data.locale" = ["*.mo"]
+"zenmapCore.data.config" = ["zenmap.conf", "scan_profile.usp", "zenmap_version"]
+"zenmapCore.data.docs" = ["*.html"]
+"zenmapCore.data.misc" = ["*.xml"]
diff --git a/zenmap/zenmapCore/BasePaths.py b/zenmap/zenmapCore/BasePaths.py
index b22925c9c..718ed6822 100644
--- a/zenmap/zenmapCore/BasePaths.py
+++ b/zenmap/zenmapCore/BasePaths.py
@@ -76,5 +76,4 @@ base_paths = dict(user_config_file=APP_NAME + '.conf',
                   target_list='target_list.txt',
                   options='options.xml',
                   user_home=HOME,
-                  db=APP_NAME + ".db",
-                  version=APP_NAME + "_version")
+                  db=APP_NAME + ".db")
diff --git a/zenmap/zenmapCore/Paths.py b/zenmap/zenmapCore/Paths.py
index 034820817..2cebfed5a 100644
--- a/zenmap/zenmapCore/Paths.py
+++ b/zenmap/zenmapCore/Paths.py
@@ -68,38 +68,13 @@ from zenmapCore.BasePaths import base_paths
 from zenmapCore.Name import APP_NAME
 
 
-# Find out the prefix under which data files (interface definition XML,
-# pixmaps, etc.) are stored. This can vary depending on whether we are running
-# in an executable package and what type of package it is, which we check using
-# the sys.frozen attribute. See
-# http://mail.python.org/pipermail/pythonmac-sig/2004-November/012121.html.
-def get_prefix():
-    from site import getsitepackages
-    frozen = getattr(sys, "frozen", None)
-    if frozen == "macosx_app" or "Zenmap.app" in sys.executable:
-        # A py2app .app bundle.
-        return os.path.join(dirname(sys.executable), "..", "Resources")
-    elif frozen is not None:
-        # Assume a py2exe executable.
-        return dirname(sys.executable)
-    elif any(__file__.startswith(pdir) for pdir in getsitepackages()):
-        # Installed in site-packages; use configured prefix.
-        return sys.prefix
-    else:
-        # Normal script execution. Look in the current directory to allow
-        # running from the distribution.
-        return os.path.abspath(os.path.dirname(sys.argv[0]))
+prefix = join(dirname(__file__), 'data')
 
-prefix = get_prefix()
-
-# These lines are overwritten by the installer to hard-code the installed
-# locations.
-CONFIG_DIR = join(prefix, "share", APP_NAME, "config")
-LOCALE_DIR = join(prefix, "share", APP_NAME, "locale")
-MISC_DIR = join(prefix, "share", APP_NAME, "misc")
-PIXMAPS_DIR = join(prefix, "share", "zenmap", "pixmaps")
-DOCS_DIR = join(prefix, "share", APP_NAME, "docs")
-NMAPDATADIR = join(prefix, "..")
+CONFIG_DIR = join(prefix, "config")
+LOCALE_DIR = join(prefix, "locale")
+MISC_DIR = join(prefix, "misc")
+PIXMAPS_DIR = join(prefix, "pixmaps")
+DOCS_DIR = join(prefix, "docs")
 
 
 def get_extra_executable_search_paths():
@@ -125,7 +100,7 @@ class Paths(object):
 
     config_files_list = ["config_file",
                          "scan_profile",
-                         "version"]
+                         ]
 
     empty_config_files_list = ["target_list",
                                "recent_scans",
@@ -140,8 +115,16 @@ class Paths(object):
         self.pixmaps_dir = PIXMAPS_DIR
         self.misc_dir = MISC_DIR
         self.docs_dir = DOCS_DIR
-        self.nmap_dir = NMAPDATADIR
         self._delayed_incomplete = True
+        PATH = os.environ.get('PATH', os.defpath)
+        extra = get_extra_executable_search_paths()
+        if extra:
+            PATH += ';' + ';'.join(extra)
+        NMAPPATH = dirname(shutil.which("nmap", path=PATH))
+        if sys.platform == 'win32':
+            self.nmap_dir = NMAPPATH
+        else:
+            self.nmap_dir = join(NMAPPATH, "..", "share", "nmap")
 
     # Delay initializing these paths so that
     # zenmapCore.I18N.install_gettext can install _() before modules that
@@ -241,4 +224,3 @@ if __name__ == '__main__':
     print(">>> OPTIONS:", Path.options)
     print()
     print(">>> DB:", Path.db)
-    print(">>> VERSION:", Path.version)
diff --git a/zenmap/share/zenmap/config/scan_profile.usp b/zenmap/zenmapCore/data/config/scan_profile.usp
similarity index 100%
rename from zenmap/share/zenmap/config/scan_profile.usp
rename to zenmap/zenmapCore/data/config/scan_profile.usp
diff --git a/zenmap/share/zenmap/config/zenmap.conf b/zenmap/zenmapCore/data/config/zenmap.conf
similarity index 100%
rename from zenmap/share/zenmap/config/zenmap.conf
rename to zenmap/zenmapCore/data/config/zenmap.conf
diff --git a/zenmap/share/zenmap/config/zenmap_version b/zenmap/zenmapCore/data/config/zenmap_version
similarity index 100%
rename from zenmap/share/zenmap/config/zenmap_version
rename to zenmap/zenmapCore/data/config/zenmap_version
diff --git a/zenmap/share/zenmap/docs/help.html b/zenmap/zenmapCore/data/docs/help.html
similarity index 100%
rename from zenmap/share/zenmap/docs/help.html
rename to zenmap/zenmapCore/data/docs/help.html
diff --git a/zenmap/share/zenmap/locale/Makefile b/zenmap/zenmapCore/data/locale/Makefile
similarity index 100%
rename from zenmap/share/zenmap/locale/Makefile
rename to zenmap/zenmapCore/data/locale/Makefile
diff --git a/zenmap/share/zenmap/locale/de.po b/zenmap/zenmapCore/data/locale/de.po
similarity index 100%
rename from zenmap/share/zenmap/locale/de.po
rename to zenmap/zenmapCore/data/locale/de.po
diff --git a/zenmap/share/zenmap/locale/de/LC_MESSAGES/zenmap.mo b/zenmap/zenmapCore/data/locale/de/LC_MESSAGES/zenmap.mo
similarity index 100%
rename from zenmap/share/zenmap/locale/de/LC_MESSAGES/zenmap.mo
rename to zenmap/zenmapCore/data/locale/de/LC_MESSAGES/zenmap.mo
diff --git a/zenmap/share/zenmap/locale/es.po b/zenmap/zenmapCore/data/locale/es.po
similarity index 100%
rename from zenmap/share/zenmap/locale/es.po
rename to zenmap/zenmapCore/data/locale/es.po
diff --git a/zenmap/share/zenmap/locale/es/LC_MESSAGES/zenmap.mo b/zenmap/zenmapCore/data/locale/es/LC_MESSAGES/zenmap.mo
similarity index 100%
rename from zenmap/share/zenmap/locale/es/LC_MESSAGES/zenmap.mo
rename to zenmap/zenmapCore/data/locale/es/LC_MESSAGES/zenmap.mo
diff --git a/zenmap/share/zenmap/locale/fr.po b/zenmap/zenmapCore/data/locale/fr.po
similarity index 100%
rename from zenmap/share/zenmap/locale/fr.po
rename to zenmap/zenmapCore/data/locale/fr.po
diff --git a/zenmap/share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo b/zenmap/zenmapCore/data/locale/fr/LC_MESSAGES/zenmap.mo
similarity index 100%
rename from zenmap/share/zenmap/locale/fr/LC_MESSAGES/zenmap.mo
rename to zenmap/zenmapCore/data/locale/fr/LC_MESSAGES/zenmap.mo
diff --git a/zenmap/share/zenmap/locale/hi.po b/zenmap/zenmapCore/data/locale/hi.po
similarity index 100%
rename from zenmap/share/zenmap/locale/hi.po
rename to zenmap/zenmapCore/data/locale/hi.po
diff --git a/zenmap/share/zenmap/locale/hi/LC_MESSAGES/zenmap.mo b/zenmap/zenmapCore/data/locale/hi/LC_MESSAGES/zenmap.mo
similarity index 100%
rename from zenmap/share/zenmap/locale/hi/LC_MESSAGES/zenmap.mo
rename to zenmap/zenmapCore/data/locale/hi/LC_MESSAGES/zenmap.mo
diff --git a/zenmap/share/zenmap/locale/hr.po b/zenmap/zenmapCore/data/locale/hr.po
similarity index 100%
rename from zenmap/share/zenmap/locale/hr.po
rename to zenmap/zenmapCore/data/locale/hr.po
diff --git a/zenmap/share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo b/zenmap/zenmapCore/data/locale/hr/LC_MESSAGES/zenmap.mo
similarity index 100%
rename from zenmap/share/zenmap/locale/hr/LC_MESSAGES/zenmap.mo
rename to zenmap/zenmapCore/data/locale/hr/LC_MESSAGES/zenmap.mo
diff --git a/zenmap/share/zenmap/locale/it.po b/zenmap/zenmapCore/data/locale/it.po
similarity index 100%
rename from zenmap/share/zenmap/locale/it.po
rename to zenmap/zenmapCore/data/locale/it.po
diff --git a/zenmap/share/zenmap/locale/it/LC_MESSAGES/zenmap.mo b/zenmap/zenmapCore/data/locale/it/LC_MESSAGES/zenmap.mo
similarity index 100%
rename from zenmap/share/zenmap/locale/it/LC_MESSAGES/zenmap.mo
rename to zenmap/zenmapCore/data/locale/it/LC_MESSAGES/zenmap.mo
diff --git a/zenmap/share/zenmap/locale/ja.po b/zenmap/zenmapCore/data/locale/ja.po
similarity index 100%
rename from zenmap/share/zenmap/locale/ja.po
rename to zenmap/zenmapCore/data/locale/ja.po
diff --git a/zenmap/share/zenmap/locale/ja/LC_MESSAGES/zenmap.mo b/zenmap/zenmapCore/data/locale/ja/LC_MESSAGES/zenmap.mo
similarity index 100%
rename from zenmap/share/zenmap/locale/ja/LC_MESSAGES/zenmap.mo
rename to zenmap/zenmapCore/data/locale/ja/LC_MESSAGES/zenmap.mo
diff --git a/zenmap/share/zenmap/locale/pl.po b/zenmap/zenmapCore/data/locale/pl.po
similarity index 100%
rename from zenmap/share/zenmap/locale/pl.po
rename to zenmap/zenmapCore/data/locale/pl.po
diff --git a/zenmap/share/zenmap/locale/pl/LC_MESSAGES/zenmap.mo b/zenmap/zenmapCore/data/locale/pl/LC_MESSAGES/zenmap.mo
similarity index 100%
rename from zenmap/share/zenmap/locale/pl/LC_MESSAGES/zenmap.mo
rename to zenmap/zenmapCore/data/locale/pl/LC_MESSAGES/zenmap.mo
diff --git a/zenmap/share/zenmap/locale/pt_BR.po b/zenmap/zenmapCore/data/locale/pt_BR.po
similarity index 100%
rename from zenmap/share/zenmap/locale/pt_BR.po
rename to zenmap/zenmapCore/data/locale/pt_BR.po
diff --git a/zenmap/share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo b/zenmap/zenmapCore/data/locale/pt_BR/LC_MESSAGES/zenmap.mo
similarity index 100%
rename from zenmap/share/zenmap/locale/pt_BR/LC_MESSAGES/zenmap.mo
rename to zenmap/zenmapCore/data/locale/pt_BR/LC_MESSAGES/zenmap.mo
diff --git a/zenmap/share/zenmap/locale/ru.po b/zenmap/zenmapCore/data/locale/ru.po
similarity index 100%
rename from zenmap/share/zenmap/locale/ru.po
rename to zenmap/zenmapCore/data/locale/ru.po
diff --git a/zenmap/share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo b/zenmap/zenmapCore/data/locale/ru/LC_MESSAGES/zenmap.mo
similarity index 100%
rename from zenmap/share/zenmap/locale/ru/LC_MESSAGES/zenmap.mo
rename to zenmap/zenmapCore/data/locale/ru/LC_MESSAGES/zenmap.mo
diff --git a/zenmap/share/zenmap/locale/xgettext-profile_editor.py b/zenmap/zenmapCore/data/locale/xgettext-profile_editor.py
similarity index 100%
rename from zenmap/share/zenmap/locale/xgettext-profile_editor.py
rename to zenmap/zenmapCore/data/locale/xgettext-profile_editor.py
diff --git a/zenmap/share/zenmap/locale/zenmap.pot b/zenmap/zenmapCore/data/locale/zenmap.pot
similarity index 100%
rename from zenmap/share/zenmap/locale/zenmap.pot
rename to zenmap/zenmapCore/data/locale/zenmap.pot
diff --git a/zenmap/share/zenmap/locale/zh.po b/zenmap/zenmapCore/data/locale/zh.po
similarity index 100%
rename from zenmap/share/zenmap/locale/zh.po
rename to zenmap/zenmapCore/data/locale/zh.po
diff --git a/zenmap/share/zenmap/locale/zh/LC_MESSAGES/zenmap.mo b/zenmap/zenmapCore/data/locale/zh/LC_MESSAGES/zenmap.mo
similarity index 100%
rename from zenmap/share/zenmap/locale/zh/LC_MESSAGES/zenmap.mo
rename to zenmap/zenmapCore/data/locale/zh/LC_MESSAGES/zenmap.mo
diff --git a/zenmap/share/zenmap/misc/profile_editor.xml b/zenmap/zenmapCore/data/misc/profile_editor.xml
similarity index 100%
rename from zenmap/share/zenmap/misc/profile_editor.xml
rename to zenmap/zenmapCore/data/misc/profile_editor.xml
diff --git a/zenmap/share/zenmap/pixmaps/default.svg b/zenmap/zenmapCore/data/pixmaps/default.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/default.svg
rename to zenmap/zenmapCore/data/pixmaps/default.svg
diff --git a/zenmap/share/zenmap/pixmaps/default_32.png b/zenmap/zenmapCore/data/pixmaps/default_32.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/default_32.png
rename to zenmap/zenmapCore/data/pixmaps/default_32.png
diff --git a/zenmap/share/zenmap/pixmaps/default_75.png b/zenmap/zenmapCore/data/pixmaps/default_75.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/default_75.png
rename to zenmap/zenmapCore/data/pixmaps/default_75.png
diff --git a/zenmap/share/zenmap/pixmaps/freebsd.svg b/zenmap/zenmapCore/data/pixmaps/freebsd.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/freebsd.svg
rename to zenmap/zenmapCore/data/pixmaps/freebsd.svg
diff --git a/zenmap/share/zenmap/pixmaps/freebsd_32.png b/zenmap/zenmapCore/data/pixmaps/freebsd_32.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/freebsd_32.png
rename to zenmap/zenmapCore/data/pixmaps/freebsd_32.png
diff --git a/zenmap/share/zenmap/pixmaps/freebsd_75.png b/zenmap/zenmapCore/data/pixmaps/freebsd_75.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/freebsd_75.png
rename to zenmap/zenmapCore/data/pixmaps/freebsd_75.png
diff --git a/zenmap/share/zenmap/pixmaps/irix.svg b/zenmap/zenmapCore/data/pixmaps/irix.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/irix.svg
rename to zenmap/zenmapCore/data/pixmaps/irix.svg
diff --git a/zenmap/share/zenmap/pixmaps/irix_32.png b/zenmap/zenmapCore/data/pixmaps/irix_32.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/irix_32.png
rename to zenmap/zenmapCore/data/pixmaps/irix_32.png
diff --git a/zenmap/share/zenmap/pixmaps/irix_75.png b/zenmap/zenmapCore/data/pixmaps/irix_75.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/irix_75.png
rename to zenmap/zenmapCore/data/pixmaps/irix_75.png
diff --git a/zenmap/share/zenmap/pixmaps/linux.svg b/zenmap/zenmapCore/data/pixmaps/linux.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/linux.svg
rename to zenmap/zenmapCore/data/pixmaps/linux.svg
diff --git a/zenmap/share/zenmap/pixmaps/linux_32.png b/zenmap/zenmapCore/data/pixmaps/linux_32.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/linux_32.png
rename to zenmap/zenmapCore/data/pixmaps/linux_32.png
diff --git a/zenmap/share/zenmap/pixmaps/linux_75.png b/zenmap/zenmapCore/data/pixmaps/linux_75.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/linux_75.png
rename to zenmap/zenmapCore/data/pixmaps/linux_75.png
diff --git a/zenmap/share/zenmap/pixmaps/macosx.svg b/zenmap/zenmapCore/data/pixmaps/macosx.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/macosx.svg
rename to zenmap/zenmapCore/data/pixmaps/macosx.svg
diff --git a/zenmap/share/zenmap/pixmaps/macosx_32.png b/zenmap/zenmapCore/data/pixmaps/macosx_32.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/macosx_32.png
rename to zenmap/zenmapCore/data/pixmaps/macosx_32.png
diff --git a/zenmap/share/zenmap/pixmaps/macosx_75.png b/zenmap/zenmapCore/data/pixmaps/macosx_75.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/macosx_75.png
rename to zenmap/zenmapCore/data/pixmaps/macosx_75.png
diff --git a/zenmap/share/zenmap/pixmaps/openbsd.svg b/zenmap/zenmapCore/data/pixmaps/openbsd.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/openbsd.svg
rename to zenmap/zenmapCore/data/pixmaps/openbsd.svg
diff --git a/zenmap/share/zenmap/pixmaps/openbsd_32.png b/zenmap/zenmapCore/data/pixmaps/openbsd_32.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/openbsd_32.png
rename to zenmap/zenmapCore/data/pixmaps/openbsd_32.png
diff --git a/zenmap/share/zenmap/pixmaps/openbsd_75.png b/zenmap/zenmapCore/data/pixmaps/openbsd_75.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/openbsd_75.png
rename to zenmap/zenmapCore/data/pixmaps/openbsd_75.png
diff --git a/zenmap/share/zenmap/pixmaps/radialnet/border.png b/zenmap/zenmapCore/data/pixmaps/radialnet/border.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/radialnet/border.png
rename to zenmap/zenmapCore/data/pixmaps/radialnet/border.png
diff --git a/zenmap/share/zenmap/pixmaps/radialnet/firewall.png b/zenmap/zenmapCore/data/pixmaps/radialnet/firewall.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/radialnet/firewall.png
rename to zenmap/zenmapCore/data/pixmaps/radialnet/firewall.png
diff --git a/zenmap/share/zenmap/pixmaps/radialnet/logo.png b/zenmap/zenmapCore/data/pixmaps/radialnet/logo.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/radialnet/logo.png
rename to zenmap/zenmapCore/data/pixmaps/radialnet/logo.png
diff --git a/zenmap/share/zenmap/pixmaps/radialnet/logo.svg b/zenmap/zenmapCore/data/pixmaps/radialnet/logo.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/radialnet/logo.svg
rename to zenmap/zenmapCore/data/pixmaps/radialnet/logo.svg
diff --git a/zenmap/share/zenmap/pixmaps/radialnet/padlock.png b/zenmap/zenmapCore/data/pixmaps/radialnet/padlock.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/radialnet/padlock.png
rename to zenmap/zenmapCore/data/pixmaps/radialnet/padlock.png
diff --git a/zenmap/share/zenmap/pixmaps/radialnet/router.png b/zenmap/zenmapCore/data/pixmaps/radialnet/router.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/radialnet/router.png
rename to zenmap/zenmapCore/data/pixmaps/radialnet/router.png
diff --git a/zenmap/share/zenmap/pixmaps/radialnet/switch.png b/zenmap/zenmapCore/data/pixmaps/radialnet/switch.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/radialnet/switch.png
rename to zenmap/zenmapCore/data/pixmaps/radialnet/switch.png
diff --git a/zenmap/share/zenmap/pixmaps/radialnet/wireless.png b/zenmap/zenmapCore/data/pixmaps/radialnet/wireless.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/radialnet/wireless.png
rename to zenmap/zenmapCore/data/pixmaps/radialnet/wireless.png
diff --git a/zenmap/share/zenmap/pixmaps/redhat.svg b/zenmap/zenmapCore/data/pixmaps/redhat.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/redhat.svg
rename to zenmap/zenmapCore/data/pixmaps/redhat.svg
diff --git a/zenmap/share/zenmap/pixmaps/redhat_32.png b/zenmap/zenmapCore/data/pixmaps/redhat_32.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/redhat_32.png
rename to zenmap/zenmapCore/data/pixmaps/redhat_32.png
diff --git a/zenmap/share/zenmap/pixmaps/redhat_75.png b/zenmap/zenmapCore/data/pixmaps/redhat_75.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/redhat_75.png
rename to zenmap/zenmapCore/data/pixmaps/redhat_75.png
diff --git a/zenmap/share/zenmap/pixmaps/solaris.svg b/zenmap/zenmapCore/data/pixmaps/solaris.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/solaris.svg
rename to zenmap/zenmapCore/data/pixmaps/solaris.svg
diff --git a/zenmap/share/zenmap/pixmaps/solaris_32.png b/zenmap/zenmapCore/data/pixmaps/solaris_32.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/solaris_32.png
rename to zenmap/zenmapCore/data/pixmaps/solaris_32.png
diff --git a/zenmap/share/zenmap/pixmaps/solaris_75.png b/zenmap/zenmapCore/data/pixmaps/solaris_75.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/solaris_75.png
rename to zenmap/zenmapCore/data/pixmaps/solaris_75.png
diff --git a/zenmap/share/zenmap/pixmaps/throbber.gif b/zenmap/zenmapCore/data/pixmaps/throbber.gif
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/throbber.gif
rename to zenmap/zenmapCore/data/pixmaps/throbber.gif
diff --git a/zenmap/share/zenmap/pixmaps/throbber.png b/zenmap/zenmapCore/data/pixmaps/throbber.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/throbber.png
rename to zenmap/zenmapCore/data/pixmaps/throbber.png
diff --git a/zenmap/share/zenmap/pixmaps/ubuntu.svg b/zenmap/zenmapCore/data/pixmaps/ubuntu.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/ubuntu.svg
rename to zenmap/zenmapCore/data/pixmaps/ubuntu.svg
diff --git a/zenmap/share/zenmap/pixmaps/ubuntu_32.png b/zenmap/zenmapCore/data/pixmaps/ubuntu_32.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/ubuntu_32.png
rename to zenmap/zenmapCore/data/pixmaps/ubuntu_32.png
diff --git a/zenmap/share/zenmap/pixmaps/ubuntu_75.png b/zenmap/zenmapCore/data/pixmaps/ubuntu_75.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/ubuntu_75.png
rename to zenmap/zenmapCore/data/pixmaps/ubuntu_75.png
diff --git a/zenmap/share/zenmap/pixmaps/unknown.svg b/zenmap/zenmapCore/data/pixmaps/unknown.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/unknown.svg
rename to zenmap/zenmapCore/data/pixmaps/unknown.svg
diff --git a/zenmap/share/zenmap/pixmaps/unknown_32.png b/zenmap/zenmapCore/data/pixmaps/unknown_32.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/unknown_32.png
rename to zenmap/zenmapCore/data/pixmaps/unknown_32.png
diff --git a/zenmap/share/zenmap/pixmaps/unknown_75.png b/zenmap/zenmapCore/data/pixmaps/unknown_75.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/unknown_75.png
rename to zenmap/zenmapCore/data/pixmaps/unknown_75.png
diff --git a/zenmap/share/zenmap/pixmaps/vl_1.svg b/zenmap/zenmapCore/data/pixmaps/vl_1.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/vl_1.svg
rename to zenmap/zenmapCore/data/pixmaps/vl_1.svg
diff --git a/zenmap/share/zenmap/pixmaps/vl_1_32.png b/zenmap/zenmapCore/data/pixmaps/vl_1_32.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/vl_1_32.png
rename to zenmap/zenmapCore/data/pixmaps/vl_1_32.png
diff --git a/zenmap/share/zenmap/pixmaps/vl_1_75.png b/zenmap/zenmapCore/data/pixmaps/vl_1_75.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/vl_1_75.png
rename to zenmap/zenmapCore/data/pixmaps/vl_1_75.png
diff --git a/zenmap/share/zenmap/pixmaps/vl_2.svg b/zenmap/zenmapCore/data/pixmaps/vl_2.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/vl_2.svg
rename to zenmap/zenmapCore/data/pixmaps/vl_2.svg
diff --git a/zenmap/share/zenmap/pixmaps/vl_2_32.png b/zenmap/zenmapCore/data/pixmaps/vl_2_32.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/vl_2_32.png
rename to zenmap/zenmapCore/data/pixmaps/vl_2_32.png
diff --git a/zenmap/share/zenmap/pixmaps/vl_2_75.png b/zenmap/zenmapCore/data/pixmaps/vl_2_75.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/vl_2_75.png
rename to zenmap/zenmapCore/data/pixmaps/vl_2_75.png
diff --git a/zenmap/share/zenmap/pixmaps/vl_3.svg b/zenmap/zenmapCore/data/pixmaps/vl_3.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/vl_3.svg
rename to zenmap/zenmapCore/data/pixmaps/vl_3.svg
diff --git a/zenmap/share/zenmap/pixmaps/vl_3_32.png b/zenmap/zenmapCore/data/pixmaps/vl_3_32.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/vl_3_32.png
rename to zenmap/zenmapCore/data/pixmaps/vl_3_32.png
diff --git a/zenmap/share/zenmap/pixmaps/vl_3_75.png b/zenmap/zenmapCore/data/pixmaps/vl_3_75.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/vl_3_75.png
rename to zenmap/zenmapCore/data/pixmaps/vl_3_75.png
diff --git a/zenmap/share/zenmap/pixmaps/vl_4.svg b/zenmap/zenmapCore/data/pixmaps/vl_4.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/vl_4.svg
rename to zenmap/zenmapCore/data/pixmaps/vl_4.svg
diff --git a/zenmap/share/zenmap/pixmaps/vl_4_32.png b/zenmap/zenmapCore/data/pixmaps/vl_4_32.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/vl_4_32.png
rename to zenmap/zenmapCore/data/pixmaps/vl_4_32.png
diff --git a/zenmap/share/zenmap/pixmaps/vl_4_75.png b/zenmap/zenmapCore/data/pixmaps/vl_4_75.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/vl_4_75.png
rename to zenmap/zenmapCore/data/pixmaps/vl_4_75.png
diff --git a/zenmap/share/zenmap/pixmaps/vl_5.svg b/zenmap/zenmapCore/data/pixmaps/vl_5.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/vl_5.svg
rename to zenmap/zenmapCore/data/pixmaps/vl_5.svg
diff --git a/zenmap/share/zenmap/pixmaps/vl_5_32.png b/zenmap/zenmapCore/data/pixmaps/vl_5_32.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/vl_5_32.png
rename to zenmap/zenmapCore/data/pixmaps/vl_5_32.png
diff --git a/zenmap/share/zenmap/pixmaps/vl_5_75.png b/zenmap/zenmapCore/data/pixmaps/vl_5_75.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/vl_5_75.png
rename to zenmap/zenmapCore/data/pixmaps/vl_5_75.png
diff --git a/zenmap/share/zenmap/pixmaps/win.svg b/zenmap/zenmapCore/data/pixmaps/win.svg
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/win.svg
rename to zenmap/zenmapCore/data/pixmaps/win.svg
diff --git a/zenmap/share/zenmap/pixmaps/win_32.png b/zenmap/zenmapCore/data/pixmaps/win_32.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/win_32.png
rename to zenmap/zenmapCore/data/pixmaps/win_32.png
diff --git a/zenmap/share/zenmap/pixmaps/win_75.png b/zenmap/zenmapCore/data/pixmaps/win_75.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/win_75.png
rename to zenmap/zenmapCore/data/pixmaps/win_75.png
diff --git a/zenmap/share/zenmap/pixmaps/zenmap.png b/zenmap/zenmapCore/data/pixmaps/zenmap.png
similarity index 100%
rename from zenmap/share/zenmap/pixmaps/zenmap.png
rename to zenmap/zenmapCore/data/pixmaps/zenmap.png