diff --git a/contrib/clear_GPS.lua b/contrib/clear_GPS.lua
index 0f2deda..bc5fc4e 100644
--- a/contrib/clear_GPS.lua
+++ b/contrib/clear_GPS.lua
@@ -46,7 +46,7 @@ dt.configuration.check_version(...,{3,0,0},{4,0,0})
 
 
 -- Tell gettext where to find the .mo file translating messages for a particular domain
-gettext.bindtextdomain("clear_GPS",dt.configuration.config_dir.."/lua/")
+gettext.bindtextdomain("clear_GPS",dt.configuration.config_dir.."/lua/locale/")
 
 local function _(msgid)
     return gettext.dgettext("clear_GPS", msgid)
diff --git a/contrib/copy_attach_detach_tags.lua b/contrib/copy_attach_detach_tags.lua
index c9a65e3..39ff09b 100644
--- a/contrib/copy_attach_detach_tags.lua
+++ b/contrib/copy_attach_detach_tags.lua
@@ -43,7 +43,7 @@ local gettext = dt.gettext
 dt.configuration.check_version(...,{3,0,0},{4,0,0},{5,0,0})
 
 -- Tell gettext where to find the .mo file translating messages for a particular domain
-gettext.bindtextdomain("copy_attach_detach_tags",dt.configuration.config_dir.."/lua/")
+gettext.bindtextdomain("copy_attach_detach_tags",dt.configuration.config_dir.."/lua/locale/")
 
 local function _(msgid)
     return gettext.dgettext("copy_attach_detach_tags", msgid)
diff --git a/contrib/geoJSON_export.lua b/contrib/geoJSON_export.lua
index 7a36772..0a780c7 100644
--- a/contrib/geoJSON_export.lua
+++ b/contrib/geoJSON_export.lua
@@ -39,7 +39,7 @@ local gettext = dt.gettext
 dt.configuration.check_version(...,{3,0,0},{4,0,0})
 	
 -- Tell gettext where to find the .mo file translating messages for a particular domain
-gettext.bindtextdomain("geoJSON_export",dt.configuration.config_dir.."/lua/")
+gettext.bindtextdomain("geoJSON_export",dt.configuration.config_dir.."/lua/locale/")
 
 local function _(msgid)
     return gettext.dgettext("geoJSON_export", msgid)
diff --git a/contrib/geoToolbox.lua b/contrib/geoToolbox.lua
index 7b69131..42efcfe 100644
--- a/contrib/geoToolbox.lua
+++ b/contrib/geoToolbox.lua
@@ -32,7 +32,7 @@ local gettext = dt.gettext
 dt.configuration.check_version(...,{3,0,0},{4,0,0})
 
 -- Tell gettext where to find the .mo file translating messages for a particular domain
-gettext.bindtextdomain("geoToolbox",dt.configuration.config_dir.."/lua/")
+gettext.bindtextdomain("geoToolbox",dt.configuration.config_dir.."/lua/locale/")
 
 local function _(msgid)
     return gettext.dgettext("geoToolbox", msgid)
diff --git a/contrib/gimp.lua b/contrib/gimp.lua
index 0f98407..56baa14 100644
--- a/contrib/gimp.lua
+++ b/contrib/gimp.lua
@@ -71,7 +71,7 @@ local gettext = dt.gettext
 dt.configuration.check_version(...,{3,0,0},{4,0,0},{5,0,0})
 
 -- Tell gettext where to find the .mo file translating messages for a particular domain
-gettext.bindtextdomain("gimp",dt.configuration.config_dir.."/lua/")
+gettext.bindtextdomain("gimp",dt.configuration.config_dir.."/lua/locale/")
 
 local function split_filepath(str)
   local result = {}
diff --git a/contrib/hugin.lua b/contrib/hugin.lua
index c1e0987..5fb777f 100644
--- a/contrib/hugin.lua
+++ b/contrib/hugin.lua
@@ -42,7 +42,7 @@ local gettext = dt.gettext
 dt.configuration.check_version(...,{2,0,0},{3,0,0},{4,0,0},{5,0,0})
 
 -- Tell gettext where to find the .mo file translating messages for a particular domain
-gettext.bindtextdomain("hugin",dt.configuration.config_dir.."/lua/")
+gettext.bindtextdomain("hugin",dt.configuration.config_dir.."/lua/locale/")
 
 local function _(msgid)
     return gettext.dgettext("hugin", msgid)
diff --git a/contrib/kml_export.lua b/contrib/kml_export.lua
index 516c661..2ab40fc 100644
--- a/contrib/kml_export.lua
+++ b/contrib/kml_export.lua
@@ -43,7 +43,7 @@ local gettext = dt.gettext
 dt.configuration.check_version(...,{3,0,0},{4,0,0})
 	
 -- Tell gettext where to find the .mo file translating messages for a particular domain
-gettext.bindtextdomain("kml_export",dt.configuration.config_dir.."/lua/")
+gettext.bindtextdomain("kml_export",dt.configuration.config_dir.."/lua/locale/")
 
 local function _(msgid)
     return gettext.dgettext("kml_export", msgid)
diff --git a/contrib/pdf_slideshow.lua b/contrib/pdf_slideshow.lua
index 0b68417..07c2757 100644
--- a/contrib/pdf_slideshow.lua
+++ b/contrib/pdf_slideshow.lua
@@ -45,7 +45,7 @@ require "official/yield"
 local gettext = dt.gettext
 
 -- Tell gettext where to find the .mo file translating messages for a particular domain
-gettext.bindtextdomain("pdf_slideshow",dt.configuration.config_dir.."/lua/")
+gettext.bindtextdomain("pdf_slideshow",dt.configuration.config_dir.."/lua/locale/")
 
 local function _(msgid)
     return gettext.dgettext("pdf_slideshow", msgid)
diff --git a/contrib/quicktag.lua b/contrib/quicktag.lua
index 914a1d7..c5ade26 100644
--- a/contrib/quicktag.lua
+++ b/contrib/quicktag.lua
@@ -52,7 +52,7 @@ local gettext = dt.gettext
 dt.configuration.check_version(...,{3,0,0},{4,0,0},{5,0,0})
 
 -- Tell gettext where to find the .mo file translating messages for a particular domain
-gettext.bindtextdomain("quicktag",dt.configuration.config_dir.."/lua/")
+gettext.bindtextdomain("quicktag",dt.configuration.config_dir.."/lua/locale/")
 
 local function _(msgid)
     return gettext.dgettext("quicktag", msgid)
diff --git a/contrib/slideshowMusic.lua b/contrib/slideshowMusic.lua
index 833fca6..bf7c4b3 100644
--- a/contrib/slideshowMusic.lua
+++ b/contrib/slideshowMusic.lua
@@ -31,7 +31,7 @@ local gettext = dt.gettext
 dt.configuration.check_version(...,{2,0,2},{3,0,0},{4,0,0})
 
 -- Tell gettext where to find the .mo file translating messages for a particular domain
-gettext.bindtextdomain("slideshowMusic",dt.configuration.config_dir.."/lua/")
+gettext.bindtextdomain("slideshowMusic",dt.configuration.config_dir.."/lua/locale/")
 
 local function _(msgid)
     return gettext.dgettext("slideshowMusic", msgid)
diff --git a/examples/gettextExample.lua b/examples/gettextExample.lua
index f42dcfe..3294041 100644
--- a/examples/gettextExample.lua
+++ b/examples/gettextExample.lua
@@ -64,7 +64,7 @@ dt.print_error(gettext.gettext("image"))
 
 -- Tell gettext where to find the .mo file translating messages for a particular domain
 
-gettext.bindtextdomain("gettextExample",dt.configuration.config_dir.."/lua/")
+gettext.bindtextdomain("gettextExample",dt.configuration.config_dir.."/lua/locale/")
 -- Translate a string using the specified textdomain
 dt.print_error(gettext.dgettext("gettextExample", 'Hello World!'))
 
diff --git a/contrib/de_DE/LC_MESSAGES/calcDistance.po b/locale/de_DE/LC_MESSAGES/calcDistance.po
similarity index 100%
rename from contrib/de_DE/LC_MESSAGES/calcDistance.po
rename to locale/de_DE/LC_MESSAGES/calcDistance.po
diff --git a/contrib/de_DE/LC_MESSAGES/clear_GPS.po b/locale/de_DE/LC_MESSAGES/clear_GPS.po
similarity index 100%
rename from contrib/de_DE/LC_MESSAGES/clear_GPS.po
rename to locale/de_DE/LC_MESSAGES/clear_GPS.po
diff --git a/contrib/de_DE/LC_MESSAGES/copy_attach_detach_tags.po b/locale/de_DE/LC_MESSAGES/copy_attach_detach_tags.po
similarity index 100%
rename from contrib/de_DE/LC_MESSAGES/copy_attach_detach_tags.po
rename to locale/de_DE/LC_MESSAGES/copy_attach_detach_tags.po
diff --git a/contrib/de_DE/LC_MESSAGES/geo_uri.po b/locale/de_DE/LC_MESSAGES/geo_uri.po
similarity index 100%
rename from contrib/de_DE/LC_MESSAGES/geo_uri.po
rename to locale/de_DE/LC_MESSAGES/geo_uri.po
diff --git a/contrib/de_DE/LC_MESSAGES/gimp.po b/locale/de_DE/LC_MESSAGES/gimp.po
similarity index 100%
rename from contrib/de_DE/LC_MESSAGES/gimp.po
rename to locale/de_DE/LC_MESSAGES/gimp.po
diff --git a/contrib/de_DE/LC_MESSAGES/gps_select.po b/locale/de_DE/LC_MESSAGES/gps_select.po
similarity index 100%
rename from contrib/de_DE/LC_MESSAGES/gps_select.po
rename to locale/de_DE/LC_MESSAGES/gps_select.po
diff --git a/contrib/de_DE/LC_MESSAGES/hugin.po b/locale/de_DE/LC_MESSAGES/hugin.po
similarity index 100%
rename from contrib/de_DE/LC_MESSAGES/hugin.po
rename to locale/de_DE/LC_MESSAGES/hugin.po
diff --git a/contrib/de_DE/LC_MESSAGES/kml_export.po b/locale/de_DE/LC_MESSAGES/kml_export.po
similarity index 100%
rename from contrib/de_DE/LC_MESSAGES/kml_export.po
rename to locale/de_DE/LC_MESSAGES/kml_export.po
diff --git a/contrib/de_DE/LC_MESSAGES/quicktag.po b/locale/de_DE/LC_MESSAGES/quicktag.po
similarity index 100%
rename from contrib/de_DE/LC_MESSAGES/quicktag.po
rename to locale/de_DE/LC_MESSAGES/quicktag.po
diff --git a/contrib/de_DE/LC_MESSAGES/slideshowMusic.po b/locale/de_DE/LC_MESSAGES/slideshowMusic.po
similarity index 100%
rename from contrib/de_DE/LC_MESSAGES/slideshowMusic.po
rename to locale/de_DE/LC_MESSAGES/slideshowMusic.po
diff --git a/contrib/fr_FR/LC_MESSAGES/calcDistance.po b/locale/fr_FR/LC_MESSAGES/calcDistance.po
similarity index 100%
rename from contrib/fr_FR/LC_MESSAGES/calcDistance.po
rename to locale/fr_FR/LC_MESSAGES/calcDistance.po
diff --git a/contrib/fr_FR/LC_MESSAGES/clear_GPS.po b/locale/fr_FR/LC_MESSAGES/clear_GPS.po
similarity index 100%
rename from contrib/fr_FR/LC_MESSAGES/clear_GPS.po
rename to locale/fr_FR/LC_MESSAGES/clear_GPS.po
diff --git a/contrib/fr_FR/LC_MESSAGES/geo_uri.po b/locale/fr_FR/LC_MESSAGES/geo_uri.po
similarity index 100%
rename from contrib/fr_FR/LC_MESSAGES/geo_uri.po
rename to locale/fr_FR/LC_MESSAGES/geo_uri.po
diff --git a/contrib/fr_FR/LC_MESSAGES/gimp.po b/locale/fr_FR/LC_MESSAGES/gimp.po
similarity index 100%
rename from contrib/fr_FR/LC_MESSAGES/gimp.po
rename to locale/fr_FR/LC_MESSAGES/gimp.po
diff --git a/contrib/fr_FR/LC_MESSAGES/gps_select.po b/locale/fr_FR/LC_MESSAGES/gps_select.po
similarity index 100%
rename from contrib/fr_FR/LC_MESSAGES/gps_select.po
rename to locale/fr_FR/LC_MESSAGES/gps_select.po
diff --git a/contrib/fr_FR/LC_MESSAGES/hugin.po b/locale/fr_FR/LC_MESSAGES/hugin.po
similarity index 100%
rename from contrib/fr_FR/LC_MESSAGES/hugin.po
rename to locale/fr_FR/LC_MESSAGES/hugin.po
diff --git a/contrib/fr_FR/LC_MESSAGES/kml_export.po b/locale/fr_FR/LC_MESSAGES/kml_export.po
similarity index 100%
rename from contrib/fr_FR/LC_MESSAGES/kml_export.po
rename to locale/fr_FR/LC_MESSAGES/kml_export.po
diff --git a/contrib/fr_FR/LC_MESSAGES/slideshowMusic.po b/locale/fr_FR/LC_MESSAGES/slideshowMusic.po
similarity index 100%
rename from contrib/fr_FR/LC_MESSAGES/slideshowMusic.po
rename to locale/fr_FR/LC_MESSAGES/slideshowMusic.po