diff --git a/.gitattributes b/.gitattributes
index fc47d53..09325b8 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,8 @@
 * text=auto !eol
 AMSICA/AMSICA-10.0.sln svneol=CRLF#text/plain eol=crlf
-AMSICA/AMSICA.props -text svneol=unset#text/xml
-AMSICA/AMSICALib/AMSICALib.vcxproj -text svneol=unset#text/xml
-AMSICA/AMSICALib/AMSICALib.vcxproj.filters -text svneol=unset#text/xml
+AMSICA/build/AMSICA.props -text svneol=unset#text/xml
+AMSICA/build/AMSICALib.vcxproj -text svneol=unset#text/xml
+AMSICA/build/AMSICALib.vcxproj.filters -text svneol=unset#text/xml
 AMSICA/include/AMSICA.h -text
 AMSICA/include/StdAfx.h -text
 AMSICA/msm/Makefile -text svneol=unset#text/plain%3B+charset%3DWindows-1250
diff --git a/.gitignore b/.gitignore
index 3d14608..2f08dfc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,11 @@
 AMSICA/*.opensdf
 AMSICA/*.sdf
 AMSICA/*.suo
-AMSICA/AMSICALib/*.user
-AMSICA/AMSICALib/Debug.Win32
-AMSICA/AMSICALib/Debug.x64
-AMSICA/AMSICALib/Release.Win32
-AMSICA/AMSICALib/Release.x64
+AMSICA/build/*.user
+AMSICA/build/AMSICALib.Debug.Win32
+AMSICA/build/AMSICALib.Debug.x64
+AMSICA/build/AMSICALib.Release.Win32
+AMSICA/build/AMSICALib.Release.x64
 AMSICA/msm/*-1.idt
 AMSICA/msm/*-2.idt
 AMSICA/msm/*-2.idtx
diff --git a/AMSICA/AMSICA-10.0.sln b/AMSICA/AMSICA-10.0.sln
index 72047fc..d31ffc8 100644
--- a/AMSICA/AMSICA-10.0.sln
+++ b/AMSICA/AMSICA-10.0.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMSICALib", "AMSICALib\AMSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AMSICALib", "build\AMSICALib.vcxproj", "{8552EE55-177E-4F51-B51B-BAF7D6462CDE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/AMSICA/AMSICA.props b/AMSICA/build/AMSICA.props
similarity index 100%
rename from AMSICA/AMSICA.props
rename to AMSICA/build/AMSICA.props
diff --git a/AMSICA/AMSICALib/AMSICALib.vcxproj b/AMSICA/build/AMSICALib.vcxproj
similarity index 72%
rename from AMSICA/AMSICALib/AMSICALib.vcxproj
rename to AMSICA/build/AMSICALib.vcxproj
index f42ef9a..f7142b3 100644
--- a/AMSICA/AMSICALib/AMSICALib.vcxproj
+++ b/AMSICA/build/AMSICALib.vcxproj
@@ -70,12 +70,33 @@
   <ImportGroup Label="ExtensionSettings">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\rcxgettext.props" />
   </ImportGroup>
-  <ImportGroup Label="PropertySheets">
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" />
-    <Import Project="$(VCInstallDir)VCProjectDefaults\Amebis $(Configuration).props" Condition="exists('$(VCInstallDir)VCProjectDefaults\Amebis $(Configuration).props')" />
-    <Import Project="$(VCInstallDir)VCProjectDefaults\Amebis $(Platform).props" Condition="exists('$(VCInstallDir)VCProjectDefaults\Amebis $(Platform).props')" />
-    <Import Project="..\AMSICA.props" />
+    <Import Project="$(VCInstallDir)VCProjectDefaults\AmebisDebug.props" />
+    <Import Project="$(VCInstallDir)VCProjectDefaults\AmebisWin32.props" />
+    <Import Project="AMSICA.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" />
+    <Import Project="$(VCInstallDir)VCProjectDefaults\AmebisDebug.props" />
+    <Import Project="$(VCInstallDir)VCProjectDefaults\Amebisx64.props" />
+    <Import Project="AMSICA.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" />
+    <Import Project="$(VCInstallDir)VCProjectDefaults\AmebisRelease.props" />
+    <Import Project="$(VCInstallDir)VCProjectDefaults\AmebisWin32.props" />
+    <Import Project="AMSICA.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCInstallDir)VCProjectDefaults\Amebis.props" />
+    <Import Project="$(VCInstallDir)VCProjectDefaults\AmebisRelease.props" />
+    <Import Project="$(VCInstallDir)VCProjectDefaults\Amebisx64.props" />
+    <Import Project="AMSICA.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugU|Win32'" />
diff --git a/AMSICA/AMSICALib/AMSICALib.vcxproj.filters b/AMSICA/build/AMSICALib.vcxproj.filters
similarity index 100%
rename from AMSICA/AMSICALib/AMSICALib.vcxproj.filters
rename to AMSICA/build/AMSICALib.vcxproj.filters