diff --git a/.gitattributes b/.gitattributes
index ee0e487..9601add 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,18 +1,21 @@
 * text=auto !eol
 /MSICA.sln svneol=CRLF#text/plain eol=crlf
 MSICACert/L10N/sl_SI.po -text
+MSICACert/MSIBuild/Makefile -text
+MSICACert/MSIBuild/build_all.bat -text
+MSICACert/MSIBuild/clean_all.bat -text
 MSICACert/MSICACert.cpp -text
 MSICACert/MSICACert.h -text
 MSICACert/MSICACert.vcxproj -text svneol=unset#text/xml
 MSICACert/MSICACert.vcxproj.filters -text svneol=unset#text/xml
-MSICACert/msm/Makefile -text
-MSICACert/msm/build_all.bat -text
-MSICACert/msm/clean_all.bat -text
 MSICACert/res/MSICACert.rc -text svneol=unset#unset
 MSICACert/res/MSICACert.rcx -text svneol=unset#unset
 MSICACert/stdafx.cpp -text
 MSICACert/stdafx.h -text
 MSICALib/L10N/sl_SI.po -text
+MSICALib/MSIBuild/Makefile -text
+MSICALib/MSIBuild/build_all.bat -text
+MSICALib/MSIBuild/clean_all.bat -text
 MSICALib/MSICALib.cpp -text
 MSICALib/MSICALib.h -text
 MSICALib/MSICALib.vcxproj -text svneol=unset#text/xml
@@ -21,19 +24,16 @@ MSICALib/OpCert.cpp -text
 MSICALib/OpFile.cpp -text
 MSICALib/OpReg.cpp -text
 MSICALib/OpTS.cpp -text
-MSICALib/msm/Makefile -text
-MSICALib/msm/build_all.bat -text
-MSICALib/msm/clean_all.bat -text
 MSICALib/stdafx.cpp -text
 MSICALib/stdafx.h -text
 MSICATS/L10N/sl_SI.po -text
+MSICATS/MSIBuild/Makefile -text
+MSICATS/MSIBuild/build_all.bat -text
+MSICATS/MSIBuild/clean_all.bat -text
 MSICATS/MSICATS.cpp -text
 MSICATS/MSICATS.h -text
 MSICATS/MSICATS.vcxproj -text svneol=unset#text/xml
 MSICATS/MSICATS.vcxproj.filters -text svneol=unset#text/xml
-MSICATS/msm/Makefile -text
-MSICATS/msm/build_all.bat -text
-MSICATS/msm/clean_all.bat -text
 MSICATS/res/MSICATS.rc -text svneol=unset#unset
 MSICATS/res/MSICATS.rcx -text svneol=unset#unset
 MSICATS/stdafx.cpp -text
diff --git a/.gitignore b/.gitignore
index ef2f2d8..f5039cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,39 +3,39 @@
 /*.suo
 MSICACert/*.user
 MSICACert/L10N/*.mo
-MSICACert/msm/*-1.idt
-MSICACert/msm/*-2.idt
-MSICACert/msm/*-2.idtx
-MSICACert/msm/*.Binary-1
-MSICACert/msm/*.Binary-2
-MSICACert/msm/*.Icon-1
-MSICACert/msm/*.Icon-2
-MSICACert/msm/*.lst
-MSICACert/msm/*.msm
+MSICACert/MSIBuild/*-1.idt
+MSICACert/MSIBuild/*-2.idt
+MSICACert/MSIBuild/*-2.idtx
+MSICACert/MSIBuild/*.Binary-1
+MSICACert/MSIBuild/*.Binary-2
+MSICACert/MSIBuild/*.Icon-1
+MSICACert/MSIBuild/*.Icon-2
+MSICACert/MSIBuild/*.lst
+MSICACert/MSIBuild/*.msm
 MSICACert/temp
 MSICALib/*.user
 MSICALib/L10N/*.mo
-MSICALib/msm/*-1.idt
-MSICALib/msm/*-2.idt
-MSICALib/msm/*-2.idtx
-MSICALib/msm/*.Binary-1
-MSICALib/msm/*.Binary-2
-MSICALib/msm/*.Icon-1
-MSICALib/msm/*.Icon-2
-MSICALib/msm/*.lst
-MSICALib/msm/*.msm
+MSICALib/MSIBuild/*-1.idt
+MSICALib/MSIBuild/*-2.idt
+MSICALib/MSIBuild/*-2.idtx
+MSICALib/MSIBuild/*.Binary-1
+MSICALib/MSIBuild/*.Binary-2
+MSICALib/MSIBuild/*.Icon-1
+MSICALib/MSIBuild/*.Icon-2
+MSICALib/MSIBuild/*.lst
+MSICALib/MSIBuild/*.msm
 MSICALib/temp
 MSICATS/*.user
 MSICATS/L10N/*.mo
-MSICATS/msm/*-1.idt
-MSICATS/msm/*-2.idt
-MSICATS/msm/*-2.idtx
-MSICATS/msm/*.Binary-1
-MSICATS/msm/*.Binary-2
-MSICATS/msm/*.Icon-1
-MSICATS/msm/*.Icon-2
-MSICATS/msm/*.lst
-MSICATS/msm/*.msm
+MSICATS/MSIBuild/*-1.idt
+MSICATS/MSIBuild/*-2.idt
+MSICATS/MSIBuild/*-2.idtx
+MSICATS/MSIBuild/*.Binary-1
+MSICATS/MSIBuild/*.Binary-2
+MSICATS/MSIBuild/*.Icon-1
+MSICATS/MSIBuild/*.Icon-2
+MSICATS/MSIBuild/*.lst
+MSICATS/MSIBuild/*.msm
 MSICATS/temp
 /ipch
 /output
diff --git a/MSICACert/L10N/sl_SI.po b/MSICACert/L10N/sl_SI.po
index 610f05e..e15023f 100644
--- a/MSICACert/L10N/sl_SI.po
+++ b/MSICACert/L10N/sl_SI.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MSICACert\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-13 12:19+0100\n"
+"POT-Creation-Date: 2014-03-14 11:10+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "X-Poedit-KeywordsList: __\n"
 "X-Poedit-Basepath: ..\n"
 "X-Generator: Poedit 1.5.7\n"
-"X-Poedit-SearchPath-0: msm\n"
+"X-Poedit-SearchPath-0: MSIBuild\n"
 "X-Poedit-SearchPath-1: res\n"
 
 # Language Code and Windows Charset (hexadecimal)
@@ -32,9 +32,10 @@ msgid "0x409"
 msgstr "0x424"
 
 # Windows charset for this language (decimal)
-#: res/MSICACert.rcx:60 msm/En.Win32.Debug.ActionText-2.idtx:3
-#: msm/En.Win32.Release.ActionText-2.idtx:3
-#: msm/En.x64.Debug.ActionText-2.idtx:3 msm/En.x64.Release.ActionText-2.idtx:3
+#: res/MSICACert.rcx:60 MSIBuild/En.Win32.Debug.ActionText-2.idtx:3
+#: MSIBuild/En.Win32.Release.ActionText-2.idtx:3
+#: MSIBuild/En.x64.Debug.ActionText-2.idtx:3
+#: MSIBuild/En.x64.Release.ActionText-2.idtx:3
 msgid "1252"
 msgstr "1250"
 
@@ -73,15 +74,17 @@ msgstr "MSICACert"
 msgid "SUBLANG_DEFAULT"
 msgstr "SUBLANG_DEFAULT"
 
-#: msm/En.Win32.Debug.ActionText-2.idtx:4
-#: msm/En.Win32.Release.ActionText-2.idtx:4
-#: msm/En.x64.Debug.ActionText-2.idtx:4 msm/En.x64.Release.ActionText-2.idtx:4
+#: MSIBuild/En.Win32.Debug.ActionText-2.idtx:4
+#: MSIBuild/En.Win32.Release.ActionText-2.idtx:4
+#: MSIBuild/En.x64.Debug.ActionText-2.idtx:4
+#: MSIBuild/En.x64.Release.ActionText-2.idtx:4
 msgid "Certificate: [1]"
 msgstr "Digitalno potrdilo: [1]"
 
-#: msm/En.Win32.Debug.ActionText-2.idtx:4
-#: msm/En.Win32.Release.ActionText-2.idtx:4
-#: msm/En.x64.Debug.ActionText-2.idtx:4 msm/En.x64.Release.ActionText-2.idtx:4
+#: MSIBuild/En.Win32.Debug.ActionText-2.idtx:4
+#: MSIBuild/En.Win32.Release.ActionText-2.idtx:4
+#: MSIBuild/En.x64.Debug.ActionText-2.idtx:4
+#: MSIBuild/En.x64.Release.ActionText-2.idtx:4
 msgid "Installing certificates"
 msgstr "Nameščanje digitalnih potrdil"
 
diff --git a/MSICACert/msm/Makefile b/MSICACert/MSIBuild/Makefile
similarity index 90%
rename from MSICACert/msm/Makefile
rename to MSICACert/MSIBuild/Makefile
index ec5ea79..fd6f7ad 100644
--- a/MSICACert/msm/Makefile
+++ b/MSICACert/MSIBuild/Makefile
@@ -15,9 +15,9 @@ Table	Column	Nullable	MinValue	MaxValue	KeyTable	KeyColumn	Category	Set	Descript
 s32	s32	s4	I4	I4	S255	I2	S32	S255	S255
 _Validation	Table	Column
 Certificate	Certificate	N					Identifier		Primary key, non-localized token.
-Certificate	Store	N					Formatted		Certificate store name (MY, Root, Trust, or CA).
+Certificate	Store	N					Formatted	MY;Root;Trust;CA	Certificate store name for CertOpenStore() function call. The store provider is always CERT_STORE_PROV_SYSTEM. Therefore, possible values are: MY, Root, Trust, or CA.
 Certificate	Flags	N					DoubleInteger		Flags for CertOpenStore() function call.
-Certificate	Encoding	N					DoubleInteger	0;1;65536;65537	Certificate encoding.
+Certificate	Encoding	N					DoubleInteger	0;1;65536;65537	Certificate encoding (combination of X509_ASN_ENCODING(1) and PKCS_7_ASN_ENCODING(65536) flags).
 Certificate	Binary_	N			Binary	1	Identifier		The certificate file. The binary information is looked up from the Binary Table.
 Certificate	Condition	Y					Condition		Optional expression which skips the certificate if evaluates to expFalse. If the expression syntax is invalid, the engine will terminate, returning iesBadActionData.
 Certificate	Component_	N			Component	1	Identifier		Component the certificate is part of.
diff --git a/MSICACert/msm/build_all.bat b/MSICACert/MSIBuild/build_all.bat
similarity index 100%
rename from MSICACert/msm/build_all.bat
rename to MSICACert/MSIBuild/build_all.bat
diff --git a/MSICACert/msm/clean_all.bat b/MSICACert/MSIBuild/clean_all.bat
similarity index 100%
rename from MSICACert/msm/clean_all.bat
rename to MSICACert/MSIBuild/clean_all.bat
diff --git a/MSICALib/L10N/sl_SI.po b/MSICALib/L10N/sl_SI.po
index a63265b..d73b87d 100644
--- a/MSICALib/L10N/sl_SI.po
+++ b/MSICALib/L10N/sl_SI.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MSICALib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-13 12:16+0100\n"
+"POT-Creation-Date: 2014-03-14 11:11+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
@@ -14,16 +14,18 @@ msgstr ""
 "X-Poedit-KeywordsList: __\n"
 "X-Poedit-Basepath: ..\n"
 "X-Generator: Poedit 1.5.7\n"
-"X-Poedit-SearchPath-0: msm\n"
+"X-Poedit-SearchPath-0: MSIBuild\n"
 
 # Windows charset for this language (decimal)
-#: msm/En.Win32.Debug.Error-2.idtx:3 msm/En.Win32.Release.Error-2.idtx:3
-#: msm/En.x64.Debug.Error-2.idtx:3 msm/En.x64.Release.Error-2.idtx:3
+#: MSIBuild/En.Win32.Debug.Error-2.idtx:3
+#: MSIBuild/En.Win32.Release.Error-2.idtx:3
+#: MSIBuild/En.x64.Debug.Error-2.idtx:3 MSIBuild/En.x64.Release.Error-2.idtx:3
 msgid "1252"
 msgstr "1250"
 
-#: msm/En.Win32.Debug.Error-2.idtx:5 msm/En.Win32.Release.Error-2.idtx:5
-#: msm/En.x64.Debug.Error-2.idtx:5 msm/En.x64.Release.Error-2.idtx:5
+#: MSIBuild/En.Win32.Debug.Error-2.idtx:5
+#: MSIBuild/En.Win32.Release.Error-2.idtx:5
+#: MSIBuild/En.x64.Debug.Error-2.idtx:5 MSIBuild/En.x64.Release.Error-2.idtx:5
 msgid ""
 "Error [2] creating scheduled task list. Please, contact your support "
 "personnel."
@@ -31,8 +33,10 @@ msgstr ""
 "Pri pripravi seznama razvrščenih opravil je prišlo do napake [2]. Obrnite se "
 "na svojo tehnično službo."
 
-#: msm/En.Win32.Debug.Error-2.idtx:11 msm/En.Win32.Release.Error-2.idtx:11
-#: msm/En.x64.Debug.Error-2.idtx:11 msm/En.x64.Release.Error-2.idtx:11
+#: MSIBuild/En.Win32.Debug.Error-2.idtx:11
+#: MSIBuild/En.Win32.Release.Error-2.idtx:11
+#: MSIBuild/En.x64.Debug.Error-2.idtx:11
+#: MSIBuild/En.x64.Release.Error-2.idtx:11
 msgid ""
 "Error [3] creating \"[2]\" scheduled task. Please, contact your support "
 "personnel."
@@ -40,16 +44,19 @@ msgstr ""
 "Pri stvaritvi razporejenega opravila »[2]« je prišlo do napake [3]. Obrnite "
 "se na svojo tehnično službo."
 
-#: msm/En.Win32.Debug.Error-2.idtx:9 msm/En.Win32.Release.Error-2.idtx:9
-#: msm/En.x64.Debug.Error-2.idtx:9 msm/En.x64.Release.Error-2.idtx:9
+#: MSIBuild/En.Win32.Debug.Error-2.idtx:9
+#: MSIBuild/En.Win32.Release.Error-2.idtx:9
+#: MSIBuild/En.x64.Debug.Error-2.idtx:9 MSIBuild/En.x64.Release.Error-2.idtx:9
 msgid ""
 "Error [3] deleting \"[2]\" file. Please, contact your support personnel."
 msgstr ""
 "Pri brisanju datoteke »[2]« je prišlo do napake [3]. Obrnite se na svojo "
 "tehnično službo."
 
-#: msm/En.Win32.Debug.Error-2.idtx:12 msm/En.Win32.Release.Error-2.idtx:12
-#: msm/En.x64.Debug.Error-2.idtx:12 msm/En.x64.Release.Error-2.idtx:12
+#: MSIBuild/En.Win32.Debug.Error-2.idtx:12
+#: MSIBuild/En.Win32.Release.Error-2.idtx:12
+#: MSIBuild/En.x64.Debug.Error-2.idtx:12
+#: MSIBuild/En.x64.Release.Error-2.idtx:12
 msgid ""
 "Error [3] deleting \"[2]\" scheduled task. Please, contact your support "
 "personnel."
@@ -57,8 +64,10 @@ msgstr ""
 "Pri brisanju razporejenega opravila »[2]« je prišlo do napake [3]. Obrnite "
 "se na svojo tehnično službo."
 
-#: msm/En.Win32.Debug.Error-2.idtx:13 msm/En.Win32.Release.Error-2.idtx:13
-#: msm/En.x64.Debug.Error-2.idtx:13 msm/En.x64.Release.Error-2.idtx:13
+#: MSIBuild/En.Win32.Debug.Error-2.idtx:13
+#: MSIBuild/En.Win32.Release.Error-2.idtx:13
+#: MSIBuild/En.x64.Debug.Error-2.idtx:13
+#: MSIBuild/En.x64.Release.Error-2.idtx:13
 msgid ""
 "Error [3] enabling/disabling \"[2]\" scheduled task. Please, contact your "
 "support personnel."
@@ -66,8 +75,10 @@ msgstr ""
 "Pri o(ne)mogočanju razporejenega opravila »[2]« je prišlo do napake [3]. "
 "Obrnite se na svojo tehnično službo."
 
-#: msm/En.Win32.Debug.Error-2.idtx:15 msm/En.Win32.Release.Error-2.idtx:15
-#: msm/En.x64.Debug.Error-2.idtx:15 msm/En.x64.Release.Error-2.idtx:15
+#: MSIBuild/En.Win32.Debug.Error-2.idtx:15
+#: MSIBuild/En.Win32.Release.Error-2.idtx:15
+#: MSIBuild/En.x64.Debug.Error-2.idtx:15
+#: MSIBuild/En.x64.Release.Error-2.idtx:15
 msgid ""
 "Error [3] installing certificate to certificate store \"[2]\". Please, "
 "contact your support personnel."
@@ -75,8 +86,9 @@ msgstr ""
 "Pri nameščanju digitalnega potrdila v shrambo »[2]« je prišlo do napake [3]. "
 "Obrnite se na svojo tehnično službo."
 
-#: msm/En.Win32.Debug.Error-2.idtx:7 msm/En.Win32.Release.Error-2.idtx:7
-#: msm/En.x64.Debug.Error-2.idtx:7 msm/En.x64.Release.Error-2.idtx:7
+#: MSIBuild/En.Win32.Debug.Error-2.idtx:7
+#: MSIBuild/En.Win32.Release.Error-2.idtx:7
+#: MSIBuild/En.x64.Debug.Error-2.idtx:7 MSIBuild/En.x64.Release.Error-2.idtx:7
 msgid ""
 "Error [3] reading from \"[2]\" task list file. Please, contact your support "
 "personnel."
@@ -84,8 +96,10 @@ msgstr ""
 "Pri branju iz datoteke seznama opravil »[2]« je prišlo do napake [3]. "
 "Obrnite se na svojo tehnično službo."
 
-#: msm/En.Win32.Debug.Error-2.idtx:16 msm/En.Win32.Release.Error-2.idtx:16
-#: msm/En.x64.Debug.Error-2.idtx:16 msm/En.x64.Release.Error-2.idtx:16
+#: MSIBuild/En.Win32.Debug.Error-2.idtx:16
+#: MSIBuild/En.Win32.Release.Error-2.idtx:16
+#: MSIBuild/En.x64.Debug.Error-2.idtx:16
+#: MSIBuild/En.x64.Release.Error-2.idtx:16
 msgid ""
 "Error [3] removing certificate from certificate store \"[2]\". Please, "
 "contact your support personnel."
@@ -93,16 +107,18 @@ msgstr ""
 "Pri odstranjevanju digitalnega potrdila iz shrambe »[2]« je prišlo do napake "
 "[3]. Obrnite se na svojo tehnično službo."
 
-#: msm/En.Win32.Debug.Error-2.idtx:8 msm/En.Win32.Release.Error-2.idtx:8
-#: msm/En.x64.Debug.Error-2.idtx:8 msm/En.x64.Release.Error-2.idtx:8
+#: MSIBuild/En.Win32.Debug.Error-2.idtx:8
+#: MSIBuild/En.Win32.Release.Error-2.idtx:8
+#: MSIBuild/En.x64.Debug.Error-2.idtx:8 MSIBuild/En.x64.Release.Error-2.idtx:8
 msgid ""
 "Error [3] setting \"[2]\" parameter. Please, contact your support personnel."
 msgstr ""
 "Pri nastavljanju parametra »[2]« je prišlo do napake [3]. Obrnite se na "
 "svojo tehnično službo."
 
-#: msm/En.Win32.Debug.Error-2.idtx:6 msm/En.Win32.Release.Error-2.idtx:6
-#: msm/En.x64.Debug.Error-2.idtx:6 msm/En.x64.Release.Error-2.idtx:6
+#: MSIBuild/En.Win32.Debug.Error-2.idtx:6
+#: MSIBuild/En.Win32.Release.Error-2.idtx:6
+#: MSIBuild/En.x64.Debug.Error-2.idtx:6 MSIBuild/En.x64.Release.Error-2.idtx:6
 msgid ""
 "Error [3] writing to \"[2]\" task list file. Please, contact your support "
 "personnel."
@@ -110,8 +126,10 @@ msgstr ""
 "Pri pisanju v datoteko seznama opravil »[2]« je prišlo do napake [3]. "
 "Obrnite se na svojo tehnično službo."
 
-#: msm/En.Win32.Debug.Error-2.idtx:14 msm/En.Win32.Release.Error-2.idtx:14
-#: msm/En.x64.Debug.Error-2.idtx:14 msm/En.x64.Release.Error-2.idtx:14
+#: MSIBuild/En.Win32.Debug.Error-2.idtx:14
+#: MSIBuild/En.Win32.Release.Error-2.idtx:14
+#: MSIBuild/En.x64.Debug.Error-2.idtx:14
+#: MSIBuild/En.x64.Release.Error-2.idtx:14
 msgid ""
 "Error [4] copying \"[2]\" scheduled task to \"[3]\". Please, contact your "
 "support personnel."
@@ -119,8 +137,10 @@ msgstr ""
 "Pri kopiranju razporejenega opravila »[2]« v »[3]« je prišlo do napake [4]. "
 "Obrnite se na svojo tehnično službo."
 
-#: msm/En.Win32.Debug.Error-2.idtx:10 msm/En.Win32.Release.Error-2.idtx:10
-#: msm/En.x64.Debug.Error-2.idtx:10 msm/En.x64.Release.Error-2.idtx:10
+#: MSIBuild/En.Win32.Debug.Error-2.idtx:10
+#: MSIBuild/En.Win32.Release.Error-2.idtx:10
+#: MSIBuild/En.x64.Debug.Error-2.idtx:10
+#: MSIBuild/En.x64.Release.Error-2.idtx:10
 msgid ""
 "Error [4] moving \"[2]\" file to \"[3]\". Please, contact your support "
 "personnel."
@@ -128,8 +148,9 @@ msgstr ""
 "Pri premikanju datoteke »[2]« v »[3]« je prišlo do napake [4]. Obrnite se na "
 "svojo tehnično službo."
 
-#: msm/En.Win32.Debug.Error-2.idtx:4 msm/En.Win32.Release.Error-2.idtx:4
-#: msm/En.x64.Debug.Error-2.idtx:4 msm/En.x64.Release.Error-2.idtx:4
+#: MSIBuild/En.Win32.Debug.Error-2.idtx:4
+#: MSIBuild/En.Win32.Release.Error-2.idtx:4
+#: MSIBuild/En.x64.Debug.Error-2.idtx:4 MSIBuild/En.x64.Release.Error-2.idtx:4
 msgid ""
 "Error opening installation package. Please, contact your support personnel."
 msgstr ""
diff --git a/MSICALib/msm/Makefile b/MSICALib/MSIBuild/Makefile
similarity index 100%
rename from MSICALib/msm/Makefile
rename to MSICALib/MSIBuild/Makefile
diff --git a/MSICALib/msm/build_all.bat b/MSICALib/MSIBuild/build_all.bat
similarity index 100%
rename from MSICALib/msm/build_all.bat
rename to MSICALib/MSIBuild/build_all.bat
diff --git a/MSICALib/msm/clean_all.bat b/MSICALib/MSIBuild/clean_all.bat
similarity index 100%
rename from MSICALib/msm/clean_all.bat
rename to MSICALib/MSIBuild/clean_all.bat
diff --git a/MSICATS/L10N/sl_SI.po b/MSICATS/L10N/sl_SI.po
index 10599af..b9f084e 100644
--- a/MSICATS/L10N/sl_SI.po
+++ b/MSICATS/L10N/sl_SI.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MSICATS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-13 12:21+0100\n"
+"POT-Creation-Date: 2014-03-14 11:12+0100\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <simon.rozman@amebis.si>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "X-Poedit-KeywordsList: __\n"
 "X-Poedit-Basepath: ..\n"
 "X-Generator: Poedit 1.5.7\n"
-"X-Poedit-SearchPath-0: msm\n"
+"X-Poedit-SearchPath-0: MSIBuild\n"
 "X-Poedit-SearchPath-1: res\n"
 
 # Language Code and Windows Charset (hexadecimal)
@@ -32,9 +32,10 @@ msgid "0x409"
 msgstr "0x424"
 
 # Windows charset for this language (decimal)
-#: res/MSICATS.rcx:60 msm/En.Win32.Debug.ActionText-2.idtx:3
-#: msm/En.Win32.Release.ActionText-2.idtx:3
-#: msm/En.x64.Debug.ActionText-2.idtx:3 msm/En.x64.Release.ActionText-2.idtx:3
+#: res/MSICATS.rcx:60 MSIBuild/En.Win32.Debug.ActionText-2.idtx:3
+#: MSIBuild/En.Win32.Release.ActionText-2.idtx:3
+#: MSIBuild/En.x64.Debug.ActionText-2.idtx:3
+#: MSIBuild/En.x64.Release.ActionText-2.idtx:3
 msgid "1252"
 msgstr "1250"
 
@@ -73,14 +74,16 @@ msgstr "Podporna knjižnica za nameščanje načrtovanih opravil"
 msgid "SUBLANG_DEFAULT"
 msgstr "SUBLANG_DEFAULT"
 
-#: msm/En.Win32.Debug.ActionText-2.idtx:4
-#: msm/En.Win32.Release.ActionText-2.idtx:4
-#: msm/En.x64.Debug.ActionText-2.idtx:4 msm/En.x64.Release.ActionText-2.idtx:4
+#: MSIBuild/En.Win32.Debug.ActionText-2.idtx:4
+#: MSIBuild/En.Win32.Release.ActionText-2.idtx:4
+#: MSIBuild/En.x64.Debug.ActionText-2.idtx:4
+#: MSIBuild/En.x64.Release.ActionText-2.idtx:4
 msgid "Registering scheduled tasks"
 msgstr "Registracija razporejenih opravil"
 
-#: msm/En.Win32.Debug.ActionText-2.idtx:4
-#: msm/En.Win32.Release.ActionText-2.idtx:4
-#: msm/En.x64.Debug.ActionText-2.idtx:4 msm/En.x64.Release.ActionText-2.idtx:4
+#: MSIBuild/En.Win32.Debug.ActionText-2.idtx:4
+#: MSIBuild/En.Win32.Release.ActionText-2.idtx:4
+#: MSIBuild/En.x64.Debug.ActionText-2.idtx:4
+#: MSIBuild/En.x64.Release.ActionText-2.idtx:4
 msgid "Scheduled task: [1]"
 msgstr "Razporejeno opravilo: [1]"
diff --git a/MSICATS/msm/Makefile b/MSICATS/MSIBuild/Makefile
similarity index 100%
rename from MSICATS/msm/Makefile
rename to MSICATS/MSIBuild/Makefile
diff --git a/MSICATS/msm/build_all.bat b/MSICATS/MSIBuild/build_all.bat
similarity index 100%
rename from MSICATS/msm/build_all.bat
rename to MSICATS/MSIBuild/build_all.bat
diff --git a/MSICATS/msm/clean_all.bat b/MSICATS/MSIBuild/clean_all.bat
similarity index 100%
rename from MSICATS/msm/clean_all.bat
rename to MSICATS/MSIBuild/clean_all.bat