diff --git a/Core/Makefile b/Core/Makefile
index 9cac61e..2c99e2c 100644
--- a/Core/Makefile
+++ b/Core/Makefile
@@ -65,16 +65,16 @@ All :: \
 	move /y << $@ > NUL
 <<NOKEEP
 
-"De.$(PLAT).$(CFG).___-2.idt" : "En.$(PLAT).$(CFG).___-2.idtx" "..\L10N\de_DE.po"
+"De.$(PLAT).$(CFG).___-2.idt" : "En.$(PLAT).$(CFG).___-2.idtx" "..\locale\de_DE.po"
 	rcxgettext.exe idtp $@ $**
 
 "En.$(PLAT).$(CFG).___-2.idt" : "En.$(PLAT).$(CFG).___-2.idtx"
 	copy /y $** $@ > NUL
 
-"It.$(PLAT).$(CFG).___-2.idt" : "En.$(PLAT).$(CFG).___-2.idtx" "..\L10N\it_IT.po"
+"It.$(PLAT).$(CFG).___-2.idt" : "En.$(PLAT).$(CFG).___-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**
 
-"Sl.$(PLAT).$(CFG).___-2.idt" : "En.$(PLAT).$(CFG).___-2.idtx" "..\L10N\sl_SI.po"
+"Sl.$(PLAT).$(CFG).___-2.idt" : "En.$(PLAT).$(CFG).___-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**
 
 !ENDIF
@@ -604,16 +604,16 @@ WriteIniValues	Writing INI files values	File: [1], Section: [2], Key: [3], Value
 WriteRegistryValues	Writing system registry values	Key: [1], Name: [2], Value: [3]
 <<NOKEEP
 
-"De.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\de_DE.po"
+"De.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\locale\de_DE.po"
 	rcxgettext.exe idtp $@ $**
 
 "En.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx"
 	copy /y $** $@ > NUL
 
-"It.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\it_IT.po"
+"It.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**
 
-"Sl.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\L10N\sl_SI.po"
+"Sl.$(PLAT).$(CFG).ActionText-2.idt" : "En.$(PLAT).$(CFG).ActionText-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**
 
 
@@ -828,16 +828,16 @@ caNewerProductFound	19		A newer version of [SimpleProductName] is already instal
 caFaultyProductFound	19		This package cannot upgrade the currently installed [SimpleProductName]. Please remove the old package first and retry.
 <<NOKEEP
 
-"De.$(PLAT).$(CFG).CustomAction-2.idt" : "En.$(PLAT).$(CFG).CustomAction-2.idtx" "..\L10N\de_DE.po"
+"De.$(PLAT).$(CFG).CustomAction-2.idt" : "En.$(PLAT).$(CFG).CustomAction-2.idtx" "..\locale\de_DE.po"
 	rcxgettext.exe idtp $@ $**
 
 "En.$(PLAT).$(CFG).CustomAction-2.idt" : "En.$(PLAT).$(CFG).CustomAction-2.idtx"
 	copy /y $** $@ > NUL
 
-"It.$(PLAT).$(CFG).CustomAction-2.idt" : "En.$(PLAT).$(CFG).CustomAction-2.idtx" "..\L10N\it_IT.po"
+"It.$(PLAT).$(CFG).CustomAction-2.idt" : "En.$(PLAT).$(CFG).CustomAction-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**
 
-"Sl.$(PLAT).$(CFG).CustomAction-2.idt" : "En.$(PLAT).$(CFG).CustomAction-2.idtx" "..\L10N\sl_SI.po"
+"Sl.$(PLAT).$(CFG).CustomAction-2.idt" : "En.$(PLAT).$(CFG).CustomAction-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**
 
 
@@ -1029,16 +1029,16 @@ i2	L0
 2943	This version of Windows does not support deploying 64-bit packages. The script [2] is for a 64-bit package.
 <<NOKEEP
 
-"De.$(PLAT).$(CFG).Error-2.idt" : "En.$(PLAT).$(CFG).Error-2.idtx" "..\L10N\de_DE.po"
+"De.$(PLAT).$(CFG).Error-2.idt" : "En.$(PLAT).$(CFG).Error-2.idtx" "..\locale\de_DE.po"
 	rcxgettext.exe idtp $@ $**
 
 "En.$(PLAT).$(CFG).Error-2.idt" : "En.$(PLAT).$(CFG).Error-2.idtx"
 	copy /y $** $@ > NUL
 
-"It.$(PLAT).$(CFG).Error-2.idt" : "En.$(PLAT).$(CFG).Error-2.idtx" "..\L10N\it_IT.po"
+"It.$(PLAT).$(CFG).Error-2.idt" : "En.$(PLAT).$(CFG).Error-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**
 
-"Sl.$(PLAT).$(CFG).Error-2.idt" : "En.$(PLAT).$(CFG).Error-2.idtx" "..\L10N\sl_SI.po"
+"Sl.$(PLAT).$(CFG).Error-2.idt" : "En.$(PLAT).$(CFG).Error-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**
 
 
@@ -1383,16 +1383,16 @@ s$(MSIBUILD_LENGTH_ID)	l0
 ProductLanguage	1033
 <<NOKEEP
 
-"De.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\L10N\de_DE.po"
+"De.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\locale\de_DE.po"
 	rcxgettext.exe idtp $@ $**
 
 "En.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx"
 	copy /y $** $@ > NUL
 
-"It.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\L10N\it_IT.po"
+"It.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**
 
-"Sl.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\L10N\sl_SI.po"
+"Sl.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**
 
 
@@ -1544,16 +1544,16 @@ VolumeCostSize	Disk Size
 VolumeCostVolume	Volume
 <<NOKEEP
 
-"De.$(PLAT).$(CFG).UIText-2.idt" : "En.$(PLAT).$(CFG).UIText-2.idtx" "..\L10N\de_DE.po"
+"De.$(PLAT).$(CFG).UIText-2.idt" : "En.$(PLAT).$(CFG).UIText-2.idtx" "..\locale\de_DE.po"
 	rcxgettext.exe idtp $@ $**
 
 "En.$(PLAT).$(CFG).UIText-2.idt" : "En.$(PLAT).$(CFG).UIText-2.idtx"
 	copy /y $** $@ > NUL
 
-"It.$(PLAT).$(CFG).UIText-2.idt" : "En.$(PLAT).$(CFG).UIText-2.idtx" "..\L10N\it_IT.po"
+"It.$(PLAT).$(CFG).UIText-2.idt" : "En.$(PLAT).$(CFG).UIText-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**
 
-"Sl.$(PLAT).$(CFG).UIText-2.idt" : "En.$(PLAT).$(CFG).UIText-2.idtx" "..\L10N\sl_SI.po"
+"Sl.$(PLAT).$(CFG).UIText-2.idt" : "En.$(PLAT).$(CFG).UIText-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**
 
 
diff --git a/UI/Makefile b/UI/Makefile
index 50450c8..749b5eb 100644
--- a/UI/Makefile
+++ b/UI/Makefile
@@ -102,16 +102,16 @@ s$(MSIBUILD_LENGTH_ID)	S64
 1252	CheckBox	Property
 <<NOKEEP
 
-"De.$(PLAT).$(CFG).CheckBox-2.idt" : "En.$(PLAT).$(CFG).CheckBox-2.idtx" "..\L10N\de_DE.po"
+"De.$(PLAT).$(CFG).CheckBox-2.idt" : "En.$(PLAT).$(CFG).CheckBox-2.idtx" "..\locale\de_DE.po"
 	rcxgettext.exe idtp $@ $**
 
 "En.$(PLAT).$(CFG).CheckBox-2.idt" : "En.$(PLAT).$(CFG).CheckBox-2.idtx"
 	copy /y $** $@ > NUL
 
-"It.$(PLAT).$(CFG).CheckBox-2.idt" : "En.$(PLAT).$(CFG).CheckBox-2.idtx" "..\L10N\it_IT.po"
+"It.$(PLAT).$(CFG).CheckBox-2.idt" : "En.$(PLAT).$(CFG).CheckBox-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**
 
-"Sl.$(PLAT).$(CFG).CheckBox-2.idt" : "En.$(PLAT).$(CFG).CheckBox-2.idtx" "..\L10N\sl_SI.po"
+"Sl.$(PLAT).$(CFG).CheckBox-2.idt" : "En.$(PLAT).$(CFG).CheckBox-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**
 
 
@@ -251,16 +251,16 @@ dlgFailed	ctlText2	Text	15	89	370	24	196611		Please try again, or contact [Manuf
 dlgFailed	ctlClose	PushButton	325	265	60	20	3		&Close	ctlBannerBitmap	
 <<NOKEEP
 
-"De.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\L10N\de_DE.po"
+"De.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\de_DE.po"
 	rcxgettext.exe idtp $@ $**
 
 "En.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx"
 	copy /y $** $@ > NUL
 
-"It.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\L10N\it_IT.po"
+"It.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**
 
-"Sl.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\L10N\sl_SI.po"
+"Sl.$(PLAT).$(CFG).Control-2.idt" : "En.$(PLAT).$(CFG).Control-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**
 
 
@@ -411,16 +411,16 @@ dlgTypeMaintenance	ctlContinue	[Progress1]	Removing	InstallMode="Remove"	506
 dlgTypeMaintenance	ctlContinue	[Progress2]	Removal	InstallMode="Remove"	507
 <<NOKEEP
 
-"De.$(PLAT).$(CFG).ControlEvent-2.idt" : "En.$(PLAT).$(CFG).ControlEvent-2.idtx" "..\L10N\de_DE.po"
+"De.$(PLAT).$(CFG).ControlEvent-2.idt" : "En.$(PLAT).$(CFG).ControlEvent-2.idtx" "..\locale\de_DE.po"
 	rcxgettext.exe idtp $@ $**
 
 "En.$(PLAT).$(CFG).ControlEvent-2.idt" : "En.$(PLAT).$(CFG).ControlEvent-2.idtx"
 	copy /y $** $@ > NUL
 
-"It.$(PLAT).$(CFG).ControlEvent-2.idt" : "En.$(PLAT).$(CFG).ControlEvent-2.idtx" "..\L10N\it_IT.po"
+"It.$(PLAT).$(CFG).ControlEvent-2.idt" : "En.$(PLAT).$(CFG).ControlEvent-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**
 
-"Sl.$(PLAT).$(CFG).ControlEvent-2.idt" : "En.$(PLAT).$(CFG).ControlEvent-2.idtx" "..\L10N\sl_SI.po"
+"Sl.$(PLAT).$(CFG).ControlEvent-2.idt" : "En.$(PLAT).$(CFG).ControlEvent-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**
 
 
@@ -485,16 +485,16 @@ s$(MSIBUILD_LENGTH_ID)	i2	i2	i2	i2	I4	L128	s50	S50	S50
 dlgError	50	50	260	120	65539	Installer Information	ErrorText		
 <<NOKEEP
 
-"De.$(PLAT).$(CFG).Dialog-2.idt" : "En.$(PLAT).$(CFG).Dialog-2.idtx" "..\L10N\de_DE.po"
+"De.$(PLAT).$(CFG).Dialog-2.idt" : "En.$(PLAT).$(CFG).Dialog-2.idtx" "..\locale\de_DE.po"
 	rcxgettext.exe idtp $@ $**
 
 "En.$(PLAT).$(CFG).Dialog-2.idt" : "En.$(PLAT).$(CFG).Dialog-2.idtx"
 	copy /y $** $@ > NUL
 
-"It.$(PLAT).$(CFG).Dialog-2.idt" : "En.$(PLAT).$(CFG).Dialog-2.idtx" "..\L10N\it_IT.po"
+"It.$(PLAT).$(CFG).Dialog-2.idt" : "En.$(PLAT).$(CFG).Dialog-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**
 
-"Sl.$(PLAT).$(CFG).Dialog-2.idt" : "En.$(PLAT).$(CFG).Dialog-2.idtx" "..\L10N\sl_SI.po"
+"Sl.$(PLAT).$(CFG).Dialog-2.idt" : "En.$(PLAT).$(CFG).Dialog-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**
 
 
@@ -586,16 +586,16 @@ TitleCustomize	Custom Installation
 ButtonTextInstall	&Install Now
 <<NOKEEP
 
-"De.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\L10N\de_DE.po"
+"De.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\locale\de_DE.po"
 	rcxgettext.exe idtp $@ $**
 
 "En.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx"
 	copy /y $** $@ > NUL
 
-"It.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\L10N\it_IT.po"
+"It.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**
 
-"Sl.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\L10N\sl_SI.po"
+"Sl.$(PLAT).$(CFG).Property-2.idt" : "En.$(PLAT).$(CFG).Property-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**
 
 
@@ -615,16 +615,16 @@ InstallModeRB	2	Repair	0	20	370	15	&Repair	Repairs errors in the most recent ins
 InstallModeRB	3	Remove	0	40	370	15	&Remove	Removes the programme from your computer.|
 <<NOKEEP
 
-"De.$(PLAT).$(CFG).RadioButton-2.idt" : "En.$(PLAT).$(CFG).RadioButton-2.idtx" "..\L10N\de_DE.po"
+"De.$(PLAT).$(CFG).RadioButton-2.idt" : "En.$(PLAT).$(CFG).RadioButton-2.idtx" "..\locale\de_DE.po"
 	rcxgettext.exe idtp $@ $**
 
 "En.$(PLAT).$(CFG).RadioButton-2.idt" : "En.$(PLAT).$(CFG).RadioButton-2.idtx"
 	copy /y $** $@ > NUL
 
-"It.$(PLAT).$(CFG).RadioButton-2.idt" : "En.$(PLAT).$(CFG).RadioButton-2.idtx" "..\L10N\it_IT.po"
+"It.$(PLAT).$(CFG).RadioButton-2.idt" : "En.$(PLAT).$(CFG).RadioButton-2.idtx" "..\locale\it_IT.po"
 	rcxgettext.exe idtp $@ $**
 
-"Sl.$(PLAT).$(CFG).RadioButton-2.idt" : "En.$(PLAT).$(CFG).RadioButton-2.idtx" "..\L10N\sl_SI.po"
+"Sl.$(PLAT).$(CFG).RadioButton-2.idt" : "En.$(PLAT).$(CFG).RadioButton-2.idtx" "..\locale\sl_SI.po"
 	rcxgettext.exe idtp $@ $**
 
 
diff --git a/L10N/.gitignore b/locale/.gitignore
similarity index 100%
rename from L10N/.gitignore
rename to locale/.gitignore
diff --git a/L10N/it_IT.po b/locale/it_IT.po
similarity index 100%
rename from L10N/it_IT.po
rename to locale/it_IT.po
diff --git a/L10N/sl_SI.po b/locale/sl_SI.po
similarity index 100%
rename from L10N/sl_SI.po
rename to locale/sl_SI.po