diff --git a/.gitattributes b/.gitattributes
index 74286d5..2148bd6 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,4 @@
 * text=auto !eol
-MSICALib/MSI/Makefile -text
 MSICALib/MSITSCA.cpp -text
 MSICALib/MSITSCA.h -text
 MSICALib/MSITSCA.vcxproj -text svneol=unset#text/xml
@@ -8,6 +7,7 @@ MSICALib/MSITSCAOp.cpp -text
 MSICALib/MSITSCAOp.h -text
 MSICALib/StdAfx.cpp -text
 MSICALib/StdAfx.h -text
+MSICALib/msm/Makefile -text
 MSICALib/res/MSITSCA.rc -text svneol=unset#unset
 MSICALib/res/MSITSCA.rcx -text svneol=unset#unset
 MSICALib/res/en_GB.po -text
diff --git a/.gitignore b/.gitignore
index 543619a..b4d5153 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,19 @@
 MSICALib/*.user
 MSICALib/Debug.Win32
 MSICALib/Debug.x64
-MSICALib/MSI/*-1.idt
-MSICALib/MSI/*-2.idt
-MSICALib/MSI/*-2.idtx
-MSICALib/MSI/*.Binary-1
-MSICALib/MSI/*.Binary-2
-MSICALib/MSI/*.Icon-1
-MSICALib/MSI/*.Icon-2
-MSICALib/MSI/*.lst
-MSICALib/MSI/*.msm
 MSICALib/Release.Win32
 MSICALib/Release.x64
 MSICALib/Unicode[!!-~]Debug.Win32
 MSICALib/Unicode[!!-~]Debug.x64
 MSICALib/Unicode[!!-~]Release.Win32
 MSICALib/Unicode[!!-~]Release.x64
+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/res/*.mo
diff --git a/MSICALib/MSI/Makefile b/MSICALib/msm/Makefile
similarity index 97%
rename from MSICALib/MSI/Makefile
rename to MSICALib/msm/Makefile
index 60b7e38..7cdca74 100644
--- a/MSICALib/MSI/Makefile
+++ b/MSICALib/msm/Makefile
@@ -208,4 +208,4 @@ TaskTrigger	Trigger
 # Izdelava modula MSM
 ######################################################################
 
-!INCLUDE "..\..\AOsn\AOsnMSI\MSM.mak"
+!INCLUDE "..\..\AOsn\msm\MSM.mak"