diff --git a/makepot b/makepot
index 550b484..61db493 100755
--- a/makepot
+++ b/makepot
@@ -1,4 +1,11 @@
-#!/bin/bash
+#!/bin/sh
 
-xgettext --language=Python --keyword=_ --output=mintmenu.pot usr/lib/linuxmint/mintMenu/mintMenu.py usr/lib/linuxmint/mintMenu/mintRemove.py usr/lib/linuxmint/mintMenu/mintMenuConfig.py usr/lib/linuxmint/mintMenu/keybinding.py usr/lib/linuxmint/mintMenu/plugins/recent.py usr/lib/linuxmint/mintMenu/plugins/applications.py usr/lib/linuxmint/mintMenu/plugins/system_management.py usr/lib/linuxmint/mintMenu/plugins/places.py
+xgettext --language=Python --keyword=_ --output=mintmenu.pot usr/share/linuxmint/mintMenu/mintMenu.py \
+#usr/share/linuxmint/mintMenu/mintRemove.py \
+usr/share/linuxmint/mintMenu/mintMenuConfig.py \
+usr/share/linuxmint/mintMenu/keybinding.py \
+usr/share/linuxmint/mintMenu/plugins/recent.py \
+usr/share/linuxmint/mintMenu/plugins/applications.py \
+usr/share/linuxmint/mintMenu/plugins/system_management.py \
+usr/share/linuxmint/mintMenu/plugins/places.py
 
diff --git a/mintmenu.pot b/mintmenu.pot
index 67d9e95..a8681d9 100644
--- a/mintmenu.pot
+++ b/mintmenu.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-01 16:15+0100\n"
+"POT-Creation-Date: 2014-08-06 04:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,557 +17,34 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:48
+#: usr/share/linuxmint/mintMenu/mintMenu.py:48
 msgid "Menu"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:256
+#: usr/share/linuxmint/mintMenu/mintMenu.py:256
 msgid "Couldn't load plugin:"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:328
+#: usr/share/linuxmint/mintMenu/mintMenu.py:328
 msgid "Couldn't initialize plugin"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:731
+#: usr/share/linuxmint/mintMenu/mintMenu.py:731
 msgid "Advanced MATE Menu"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:818
+#: usr/share/linuxmint/mintMenu/mintMenu.py:818
 msgid "Preferences"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:821
+#: usr/share/linuxmint/mintMenu/mintMenu.py:821
 msgid "Edit menu"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:824
+#: usr/share/linuxmint/mintMenu/mintMenu.py:824
 msgid "Reload plugins"
 msgstr ""
 
-#: usr/lib/linuxmint/mintMenu/mintMenu.py:827
+#: usr/share/linuxmint/mintMenu/mintMenu.py:827
 msgid "About"
 msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintRemove.py:40
-msgid "Please wait, this can take some time"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintRemove.py:42
-msgid "Application removed successfully"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintRemove.py:87
-msgid "No matching package found"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintRemove.py:88
-msgid "Do you want to remove this menu entry?"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintRemove.py:106
-#, python-format
-msgid "Remove %s?"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintRemove.py:109
-msgid "The following packages will be removed:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintRemove.py:112
-msgid "Packages to be removed"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:42
-msgid "Menu preferences"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:45
-msgid "Always start with favorites pane"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:46
-msgid "Show button icon"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:47
-msgid "Use custom colors"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:48
-msgid "Show recent documents plugin"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:49
-msgid "Show applications plugin"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:50
-msgid "Show system plugin"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:51
-msgid "Show places plugin"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:53
-msgid "Show application comments"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:54
-msgid "Show category icons"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:55
-msgid "Hover"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:56
-msgid "Remember the last category or search"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:57
-msgid "Search for packages to install"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:58
-msgid "Swap name and generic name"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:60
-msgid "Border width:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:61
-msgid "pixels"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:63
-msgid "Opacity:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:66
-msgid "Button text:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:67
-msgid "Options"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:68
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:251
-msgid "Applications"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:70
-msgid "Theme"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:71
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:248
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:249
-msgid "Favorites"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:72
-msgid "Main button"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:74
-msgid "Background:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:75
-msgid "Headings:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:76
-msgid "Borders:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:77
-msgid "Theme:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:81
-msgid "Number of columns:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:82
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:83
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:84
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:85
-msgid "Icon size:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:86
-msgid "Hover delay (ms):"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:87
-msgid "Button icon:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:88
-msgid "Search command:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:90
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:44
-msgid "Places"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:91
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:103
-msgid "Allow Scrollbar"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:92
-msgid "Show GTK Bookmarks"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:93
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:104
-msgid "Height:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:94
-msgid "Toggle Default Places:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:95
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:141
-msgid "Computer"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:96
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:151
-msgid "Home Folder"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:97
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:164
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:166
-msgid "Network"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:98
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:189
-msgid "Desktop"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:99
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:199
-msgid "Trash"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:100
-msgid "Custom Places:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:102
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:40
-msgid "System"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:105
-msgid "Toggle Default Items:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:106
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:136
-msgid "Software Manager"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:107
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:143
-msgid "Package Manager"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:108
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:150
-msgid "Control Center"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:109
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:160
-msgid "Terminal"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:110
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:177
-msgid "Lock Screen"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:111
-msgid "Log Out"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:112
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:194
-msgid "Quit"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:114
-msgid "Edit Place"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:115
-msgid "New Place"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:116
-msgid "Select a folder"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:146
-msgid "Keyboard shortcut:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:152
-msgid "Images"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:270
-msgid "Name"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:271
-msgid "Path"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:286
-msgid "Desktop theme"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:425
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:456
-msgid "Name:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:426
-#: usr/lib/linuxmint/mintMenu/mintMenuConfig.py:457
-msgid "Path:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/keybinding.py:197
-msgid "Click to set a new accelerator key for opening and closing the menu.  "
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/keybinding.py:198
-msgid "Press Escape or click again to cancel the operation.  "
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/keybinding.py:199
-msgid "Press Backspace to clear the existing keybinding."
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/keybinding.py:212
-msgid "Pick an accelerator"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/keybinding.py:265
-msgid "<not set>"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/recent.py:31
-msgid "Recent documents"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:246
-msgid "Search:"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:250
-msgid "All applications"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:634
-#, python-format
-msgid "Search Google for %s"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:641
-#, python-format
-msgid "Search Wikipedia for %s"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:657
-#, python-format
-msgid "Lookup %s in Dictionary"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:664
-#, python-format
-msgid "Search Computer for %s"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:742
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:795
-#, python-format
-msgid "Install package '%s'"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:919
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:987
-msgid "Add to desktop"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:920
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:988
-msgid "Add to panel"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:922
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:970
-msgid "Insert space"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:923
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:971
-msgid "Insert separator"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:925
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:991
-msgid "Launch when I log in"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:927
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:993
-msgid "Launch"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:928
-msgid "Remove from favorites"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:930
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:997
-msgid "Edit properties"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:969
-msgid "Remove"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:990
-msgid "Show in my favorites"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:994
-msgid "Uninstall"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:995
-msgid "Delete from menu"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1049
-msgid "Search Google"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1056
-msgid "Search Wikipedia"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1066
-msgid "Lookup Dictionary"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1073
-msgid "Search Computer"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1083
-msgid "Find Software"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1090
-msgid "Find Tutorials"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1097
-msgid "Find Hardware"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1104
-msgid "Find Ideas"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1111
-msgid "Find Users"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1578
-msgid ""
-"Couldn't save favorites. Check if you have write access to ~/.linuxmint/"
-"mintMenu"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1772
-msgid "All"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/applications.py:1772
-msgid "Show all applications"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:140
-msgid "Browse and install available software"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:147
-msgid "Install, remove and upgrade software packages"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:157
-msgid "Configure your system"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:167
-msgid "Use the command line"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:170
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:187
-msgid "Logout"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:174
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:191
-msgid "Log out or switch user"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:184
-msgid "Requires password to unlock"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/system_management.py:198
-msgid "Shutdown, restart, suspend or hibernate"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:148
-msgid ""
-"Browse all local and remote disks and folders accessible from this computer"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:158
-msgid "Open your personal folder"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:173
-msgid "Browse bookmarked and local network locations"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:196
-msgid "Browse items placed on the desktop"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:210
-msgid "Browse deleted files"
-msgstr ""
-
-#: usr/lib/linuxmint/mintMenu/plugins/places.py:262
-msgid "Empty trash"
-msgstr ""
diff --git a/test b/test
index 420ee58..558aa1d 100755
--- a/test
+++ b/test
@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
-sudo rm -rf /usr/lib/linuxmint/mintMenu
+sudo rm -rf /usr/share/linuxmint/mintMenu
 sudo cp -R usr /
 sudo glib-compile-schemas /usr/share/glib-2.0/schemas
 
-python /usr/lib/linuxmint/mintMenu/mintMenu.py
+python /usr/share/linuxmint/mintMenu/mintMenu.py
diff --git a/usr/bin/mintmenu b/usr/bin/mintmenu
index 81d7a0a..093d05c 100755
--- a/usr/bin/mintmenu
+++ b/usr/bin/mintmenu
@@ -12,4 +12,4 @@ if len(sys.argv) > 1:
         os.system("rm -rf ~/.linuxmint/mintMenu")
         print "All mintMenu settings are now restored to default"
 else:
-    os.system("/usr/lib/linuxmint/mintMenu/mintMenu.py")
+    os.system("/usr/share/linuxmint/mintMenu/mintMenu.py")
diff --git a/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service b/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service
index 8e85c6b..203593a 100644
--- a/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service
+++ b/usr/share/dbus-1/services/org.mate.panel.applet.MintMenuAppletFactory.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.panel.applet.MintMenuAppletFactory
-Exec=/usr/lib/linuxmint/mintMenu/mintMenu.py
+Exec=/usr/share/linuxmint/mintMenu/mintMenu.py
diff --git a/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml b/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
index 69387b3..9acdf65 100644
--- a/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
+++ b/usr/share/glib-2.0/schemas/com.linuxmint.mintmenu.gschema.xml
@@ -69,7 +69,7 @@
     </key>
     
     <key type="s" name="applet-icon">
-      <default>"/usr/lib/linuxmint/mintMenu/visualisation-logo.png"</default>
+      <default>"/usr/share/linuxmint/mintMenu/visualisation-logo.png"</default>
       <summary></summary>
       <description></description>
     </key>
diff --git a/usr/lib/linuxmint/mintMenu/applications.list b/usr/share/linuxmint/mintMenu/applications.list
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/applications.list
rename to usr/share/linuxmint/mintMenu/applications.list
diff --git a/usr/lib/linuxmint/mintMenu/capi.py b/usr/share/linuxmint/mintMenu/capi.py
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/capi.py
rename to usr/share/linuxmint/mintMenu/capi.py
diff --git a/usr/lib/linuxmint/mintMenu/compile.py b/usr/share/linuxmint/mintMenu/compile.py
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/compile.py
rename to usr/share/linuxmint/mintMenu/compile.py
diff --git a/usr/lib/linuxmint/mintMenu/dotted.png b/usr/share/linuxmint/mintMenu/dotted.png
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/dotted.png
rename to usr/share/linuxmint/mintMenu/dotted.png
diff --git a/usr/lib/linuxmint/mintMenu/icon.png b/usr/share/linuxmint/mintMenu/icon.png
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/icon.png
rename to usr/share/linuxmint/mintMenu/icon.png
diff --git a/usr/lib/linuxmint/mintMenu/icon.svg b/usr/share/linuxmint/mintMenu/icon.svg
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/icon.svg
rename to usr/share/linuxmint/mintMenu/icon.svg
diff --git a/usr/lib/linuxmint/mintMenu/keybinding.py b/usr/share/linuxmint/mintMenu/keybinding.py
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/keybinding.py
rename to usr/share/linuxmint/mintMenu/keybinding.py
diff --git a/usr/lib/linuxmint/mintMenu/mint-logo.svg b/usr/share/linuxmint/mintMenu/mint-logo.svg
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/mint-logo.svg
rename to usr/share/linuxmint/mintMenu/mint-logo.svg
diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.glade b/usr/share/linuxmint/mintMenu/mintMenu.glade
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/mintMenu.glade
rename to usr/share/linuxmint/mintMenu/mintMenu.glade
diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.png b/usr/share/linuxmint/mintMenu/mintMenu.png
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/mintMenu.png
rename to usr/share/linuxmint/mintMenu/mintMenu.png
diff --git a/usr/lib/linuxmint/mintMenu/mintMenu.py b/usr/share/linuxmint/mintMenu/mintMenu.py
similarity index 99%
rename from usr/lib/linuxmint/mintMenu/mintMenu.py
rename to usr/share/linuxmint/mintMenu/mintMenu.py
index 1b4fd07..5cbb3ef 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenu.py
+++ b/usr/share/linuxmint/mintMenu/mintMenu.py
@@ -69,7 +69,7 @@ class MainWindow( object ):
 
         self.detect_desktop_environment()
 
-        self.icon = "/usr/lib/linuxmint/mintMenu/visualisation-logo.png"
+        self.icon = "/usr/share/linuxmint/mintMenu/visualisation-logo.png"
 
         self.toggle = toggleButton
         # Load UI file and extract widgets   
@@ -732,7 +732,7 @@ class MenuWin( object ):
       #  about.set_authors( ["Clement Lefebvre <clem@linuxmint.com>", "Lars-Peter Clausen <lars@laprican.de>"] )
         about.set_translator_credits(("translator-credits") )
         #about.set_copyright( _("Based on USP from S.Chanderbally") )
-        about.set_logo( GdkPixbuf.Pixbuf.new_from_file("/usr/lib/linuxmint/mintMenu/icon.svg") )
+        about.set_logo( GdkPixbuf.Pixbuf.new_from_file("/usr/share/linuxmint/mintMenu/icon.svg") )
         about.connect( "response", lambda dialog, r: dialog.destroy() )
         about.show()
 
diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.glade b/usr/share/linuxmint/mintMenu/mintMenuConfig.glade
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/mintMenuConfig.glade
rename to usr/share/linuxmint/mintMenu/mintMenuConfig.glade
diff --git a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py b/usr/share/linuxmint/mintMenu/mintMenuConfig.py
similarity index 99%
rename from usr/lib/linuxmint/mintMenu/mintMenuConfig.py
rename to usr/share/linuxmint/mintMenu/mintMenuConfig.py
index d120edd..c8b035b 100755
--- a/usr/lib/linuxmint/mintMenu/mintMenuConfig.py
+++ b/usr/share/linuxmint/mintMenu/mintMenuConfig.py
@@ -40,7 +40,7 @@ class mintMenuConfig( object ):
 
         #i18n
         self.mainWindow.set_title(_("Menu preferences"))
-        self.mainWindow.set_icon_from_file("/usr/lib/linuxmint/mintMenu/icon.svg")
+        self.mainWindow.set_icon_from_file("/usr/share/linuxmint/mintMenu/icon.svg")
 
         self.builder.get_object("startWithFavorites").set_label(_("Always start with favorites pane"))
         self.builder.get_object("showButtonIcon").set_label(_("Show button icon"))
@@ -427,7 +427,7 @@ class mintMenuConfig( object ):
         newPlaceDialog = self.builder.get_object( "editPlaceDialog" )
         folderChooserDialog = self.builder.get_object( "fileChooserDialog" )
         newPlaceDialog.set_transient_for(self.mainWindow)
-        newPlaceDialog.set_icon_from_file("/usr/lib/linuxmint/mintMenu/icon.svg")
+        newPlaceDialog.set_icon_from_file("/usr/share/linuxmint/mintMenu/icon.svg")
         newPlaceDialog.set_title(self.newPlaceDialogTitle)
         folderChooserDialog.set_title(self.folderChooserDialogTitle)
         newPlaceDialog.set_default_response(Gtk.ResponseType.OK)
@@ -458,7 +458,7 @@ class mintMenuConfig( object ):
         editPlaceDialog = self.builder.get_object( "editPlaceDialog" )
         folderChooserDialog = self.builder.get_object( "fileChooserDialog" )
         editPlaceDialog.set_transient_for(self.mainWindow)
-        editPlaceDialog.set_icon_from_file("/usr/lib/linuxmint/mintMenu/icon.svg")
+        editPlaceDialog.set_icon_from_file("/usr/share/linuxmint/mintMenu/icon.svg")
         editPlaceDialog.set_title(self.editPlaceDialogTitle)
         folderChooserDialog.set_title(self.folderChooserDialogTitle)
         editPlaceDialog.set_default_response(Gtk.ResponseType.OK)
diff --git a/usr/lib/linuxmint/mintMenu/plugins/__init__.py b/usr/share/linuxmint/mintMenu/plugins/__init__.py
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/__init__.py
rename to usr/share/linuxmint/mintMenu/plugins/__init__.py
diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.glade b/usr/share/linuxmint/mintMenu/plugins/applications.glade
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/applications.glade
rename to usr/share/linuxmint/mintMenu/plugins/applications.glade
diff --git a/usr/lib/linuxmint/mintMenu/plugins/applications.py b/usr/share/linuxmint/mintMenu/plugins/applications.py
similarity index 98%
rename from usr/lib/linuxmint/mintMenu/plugins/applications.py
rename to usr/share/linuxmint/mintMenu/plugins/applications.py
index e698fbb..1078734 100755
--- a/usr/lib/linuxmint/mintMenu/plugins/applications.py
+++ b/usr/share/linuxmint/mintMenu/plugins/applications.py
@@ -343,7 +343,7 @@ class pluginclass( object ):
     def refresh_apt_cache(self):
         if self.useAPT:
             os.system("mkdir -p %s/.linuxmint/mintMenu/" % home)
-            os.system("/usr/lib/linuxmint/mintMenu/plugins/get_apt_cache.py > %s/.linuxmint/mintMenu/apt.cache &" % home)            
+            os.system("/usr/share/linuxmint/mintMenu/plugins/get_apt_cache.py > %s/.linuxmint/mintMenu/apt.cache &" % home)            
 
     def get_panel(self):
         panelsettings = Gio.Settings.new("org.mate.panel")
@@ -632,14 +632,14 @@ class pluginclass( object ):
         suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
         suggestionButton.connect("clicked", self.search_google)
         suggestionButton.set_text(_("Search Google for %s") % text)
-        suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/google.ico")
+        suggestionButton.set_image("/usr/share/linuxmint/mintMenu/search_engines/google.ico")
         self.applicationsBox.add(suggestionButton)
         self.suggestions.append(suggestionButton)
         
         suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
         suggestionButton.connect("clicked", self.search_wikipedia)
         suggestionButton.set_text(_("Search Wikipedia for %s") % text)
-        suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico")
+        suggestionButton.set_image("/usr/share/linuxmint/mintMenu/search_engines/wikipedia.ico")
         self.applicationsBox.add(suggestionButton)
         self.suggestions.append(suggestionButton)
                 
@@ -655,7 +655,7 @@ class pluginclass( object ):
         suggestionButton = SuggestionButton(Gtk.STOCK_ADD, self.iconSize, "")
         suggestionButton.connect("clicked", self.search_dictionary)
         suggestionButton.set_text(_("Lookup %s in Dictionary") % text)
-        suggestionButton.set_image("/usr/lib/linuxmint/mintMenu/search_engines/dictionary.png")
+        suggestionButton.set_image("/usr/share/linuxmint/mintMenu/search_engines/dictionary.png")
         self.applicationsBox.add(suggestionButton)
         self.suggestions.append(suggestionButton)  
         
@@ -1047,14 +1047,14 @@ class pluginclass( object ):
 
         menuItem = Gtk.ImageMenuItem(_("Search Google"))
         img = Gtk.Image()
-        img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/google.ico')
+        img.set_from_file('/usr/share/linuxmint/mintMenu/search_engines/google.ico')
         menuItem.set_image(img)
         menuItem.connect("activate", self.search_google)
         menu.append(menuItem)
         
         menuItem = Gtk.ImageMenuItem(_("Search Wikipedia"))
         img = Gtk.Image()
-        img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico')
+        img.set_from_file('/usr/share/linuxmint/mintMenu/search_engines/wikipedia.ico')
         menuItem.set_image(img)
         menuItem.connect("activate", self.search_wikipedia)
         menu.append(menuItem)
@@ -1064,7 +1064,7 @@ class pluginclass( object ):
         
         menuItem = Gtk.ImageMenuItem(_("Lookup Dictionary"))
         img = Gtk.Image()
-        img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/dictionary.png')
+        img.set_from_file('/usr/share/linuxmint/mintMenu/search_engines/dictionary.png')
         menuItem.set_image(img)
         menuItem.connect("activate", self.search_dictionary)
         menu.append(menuItem)
@@ -1081,35 +1081,35 @@ class pluginclass( object ):
         
         menuItem = Gtk.ImageMenuItem(_("Find Software"))
         img = Gtk.Image()
-        img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/software.png')
+        img.set_from_file('/usr/share/linuxmint/mintMenu/search_engines/software.png')
         menuItem.set_image(img)
         menuItem.connect("activate", self.search_mint_software)
         menu.append(menuItem)
         
         menuItem = Gtk.ImageMenuItem(_("Find Tutorials"))
         img = Gtk.Image()
-        img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/tutorials.png')
+        img.set_from_file('/usr/share/linuxmint/mintMenu/search_engines/tutorials.png')
         menuItem.set_image(img)
         menuItem.connect("activate", self.search_mint_tutorials)
         menu.append(menuItem)
         
         menuItem = Gtk.ImageMenuItem(_("Find Hardware"))
         img = Gtk.Image()
-        img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/hardware.png')
+        img.set_from_file('/usr/share/linuxmint/mintMenu/search_engines/hardware.png')
         menuItem.set_image(img)
         menuItem.connect("activate", self.search_mint_hardware)
         menu.append(menuItem)
         
         menuItem =Gtk.ImageMenuItem(_("Find Ideas"))
         img = Gtk.Image()
-        img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/ideas.png')
+        img.set_from_file('/usr/share/linuxmint/mintMenu/search_engines/ideas.png')
         menuItem.set_image(img)
         menuItem.connect("activate", self.search_mint_ideas)
         menu.append(menuItem)
         
         menuItem = Gtk.ImageMenuItem(_("Find Users"))
         img = Gtk.Image()
-        img.set_from_file('/usr/lib/linuxmint/mintMenu/search_engines/users.png')
+        img.set_from_file('/usr/share/linuxmint/mintMenu/search_engines/users.png')
         menuItem.set_image(img)
         menuItem.connect("activate", self.search_mint_users)
         menu.append(menuItem)
@@ -1422,7 +1422,7 @@ class pluginclass( object ):
             from user import home
             if (not os.path.exists(home + "/.linuxmint/mintMenu/applications.list")):
                 os.system("mkdir -p " + home + "/.linuxmint/mintMenu/applications")
-                os.system("cp /usr/lib/linuxmint/mintMenu/applications.list " + home + "/.linuxmint/mintMenu/applications.list")
+                os.system("cp /usr/share/linuxmint/mintMenu/applications.list " + home + "/.linuxmint/mintMenu/applications.list")
 
             applicationsFile = open ( os.path.join( os.path.expanduser( "~" ), ".linuxmint", "mintMenu", "applications.list" ), "r" )
             applicationsList = applicationsFile.readlines()
diff --git a/usr/lib/linuxmint/mintMenu/plugins/easybuttons.py b/usr/share/linuxmint/mintMenu/plugins/easybuttons.py
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/easybuttons.py
rename to usr/share/linuxmint/mintMenu/plugins/easybuttons.py
diff --git a/usr/lib/linuxmint/mintMenu/plugins/easyfiles.py b/usr/share/linuxmint/mintMenu/plugins/easyfiles.py
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/easyfiles.py
rename to usr/share/linuxmint/mintMenu/plugins/easyfiles.py
diff --git a/usr/lib/linuxmint/mintMenu/plugins/easygsettings.py b/usr/share/linuxmint/mintMenu/plugins/easygsettings.py
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/easygsettings.py
rename to usr/share/linuxmint/mintMenu/plugins/easygsettings.py
diff --git a/usr/lib/linuxmint/mintMenu/plugins/execute.py b/usr/share/linuxmint/mintMenu/plugins/execute.py
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/execute.py
rename to usr/share/linuxmint/mintMenu/plugins/execute.py
diff --git a/usr/lib/linuxmint/mintMenu/plugins/filemonitor.py b/usr/share/linuxmint/mintMenu/plugins/filemonitor.py
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/filemonitor.py
rename to usr/share/linuxmint/mintMenu/plugins/filemonitor.py
diff --git a/usr/lib/linuxmint/mintMenu/plugins/get_apt_cache.py b/usr/share/linuxmint/mintMenu/plugins/get_apt_cache.py
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/get_apt_cache.py
rename to usr/share/linuxmint/mintMenu/plugins/get_apt_cache.py
diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.glade b/usr/share/linuxmint/mintMenu/plugins/places.glade
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/places.glade
rename to usr/share/linuxmint/mintMenu/plugins/places.glade
diff --git a/usr/lib/linuxmint/mintMenu/plugins/places.py b/usr/share/linuxmint/mintMenu/plugins/places.py
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/places.py
rename to usr/share/linuxmint/mintMenu/plugins/places.py
diff --git a/usr/lib/linuxmint/mintMenu/plugins/recent.glade b/usr/share/linuxmint/mintMenu/plugins/recent.glade
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/recent.glade
rename to usr/share/linuxmint/mintMenu/plugins/recent.glade
diff --git a/usr/lib/linuxmint/mintMenu/plugins/recent.py b/usr/share/linuxmint/mintMenu/plugins/recent.py
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/recent.py
rename to usr/share/linuxmint/mintMenu/plugins/recent.py
diff --git a/usr/lib/linuxmint/mintMenu/plugins/system_management.glade b/usr/share/linuxmint/mintMenu/plugins/system_management.glade
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/system_management.glade
rename to usr/share/linuxmint/mintMenu/plugins/system_management.glade
diff --git a/usr/lib/linuxmint/mintMenu/plugins/system_management.py b/usr/share/linuxmint/mintMenu/plugins/system_management.py
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/plugins/system_management.py
rename to usr/share/linuxmint/mintMenu/plugins/system_management.py
diff --git a/usr/lib/linuxmint/mintMenu/pointerMonitor.py b/usr/share/linuxmint/mintMenu/pointerMonitor.py
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/pointerMonitor.py
rename to usr/share/linuxmint/mintMenu/pointerMonitor.py
diff --git a/usr/lib/linuxmint/mintMenu/popup.xml b/usr/share/linuxmint/mintMenu/popup.xml
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/popup.xml
rename to usr/share/linuxmint/mintMenu/popup.xml
diff --git a/usr/lib/linuxmint/mintMenu/search_engines/dictionary.png b/usr/share/linuxmint/mintMenu/search_engines/dictionary.png
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/search_engines/dictionary.png
rename to usr/share/linuxmint/mintMenu/search_engines/dictionary.png
diff --git a/usr/lib/linuxmint/mintMenu/search_engines/google.ico b/usr/share/linuxmint/mintMenu/search_engines/google.ico
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/search_engines/google.ico
rename to usr/share/linuxmint/mintMenu/search_engines/google.ico
diff --git a/usr/lib/linuxmint/mintMenu/search_engines/hardware.png b/usr/share/linuxmint/mintMenu/search_engines/hardware.png
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/search_engines/hardware.png
rename to usr/share/linuxmint/mintMenu/search_engines/hardware.png
diff --git a/usr/lib/linuxmint/mintMenu/search_engines/ideas.png b/usr/share/linuxmint/mintMenu/search_engines/ideas.png
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/search_engines/ideas.png
rename to usr/share/linuxmint/mintMenu/search_engines/ideas.png
diff --git a/usr/lib/linuxmint/mintMenu/search_engines/software.png b/usr/share/linuxmint/mintMenu/search_engines/software.png
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/search_engines/software.png
rename to usr/share/linuxmint/mintMenu/search_engines/software.png
diff --git a/usr/lib/linuxmint/mintMenu/search_engines/tutorials.png b/usr/share/linuxmint/mintMenu/search_engines/tutorials.png
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/search_engines/tutorials.png
rename to usr/share/linuxmint/mintMenu/search_engines/tutorials.png
diff --git a/usr/lib/linuxmint/mintMenu/search_engines/users.png b/usr/share/linuxmint/mintMenu/search_engines/users.png
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/search_engines/users.png
rename to usr/share/linuxmint/mintMenu/search_engines/users.png
diff --git a/usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico b/usr/share/linuxmint/mintMenu/search_engines/wikipedia.ico
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/search_engines/wikipedia.ico
rename to usr/share/linuxmint/mintMenu/search_engines/wikipedia.ico
diff --git a/usr/lib/linuxmint/mintMenu/visualisation-logo.png b/usr/share/linuxmint/mintMenu/visualisation-logo.png
similarity index 100%
rename from usr/lib/linuxmint/mintMenu/visualisation-logo.png
rename to usr/share/linuxmint/mintMenu/visualisation-logo.png
diff --git a/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet b/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet
index 98bf165..ecd9b74 100644
--- a/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet
+++ b/usr/share/mate-panel/applets/org.mate.panel.MintMenuApplet.mate-panel-applet
@@ -1,13 +1,13 @@
 [Applet Factory]
 Id=MintMenuAppletFactory
 InProcess=false
-Location=/usr/lib/linuxmint/mintMenu/mintMenu.py
+Location=/usr/share/linuxmint/mintMenu/mintMenu.py
 Name=MintMenu Applet Factory
 Description=Advanced Menu
  
 [MintMenuApplet]
 Name=mintMenu
 Description=Advanced Menu
-Icon=/usr/lib/linuxmint/mintMenu/mint-logo.svg
+Icon=/usr/share/linuxmint/mintMenu/mint-logo.svg
 MateComponentId=OAFIID:MATE_MintMenuApplet;