diff --git a/CASA-auth-token/client/library/mechanisms/krb5/windows/krb5.vcproj b/CASA-auth-token/client/library/mechanisms/krb5/windows/krb5.vcproj
index 13083609..3cedcd5d 100644
--- a/CASA-auth-token/client/library/mechanisms/krb5/windows/krb5.vcproj
+++ b/CASA-auth-token/client/library/mechanisms/krb5/windows/krb5.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-DSECURITY_WIN32 -D"_CRT_SECURE_NO_DEPRECATE""
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;"..\..\..\..\..\..\..\Expat-2.0.0\source\lib";"c:\Program Files\Novell\CASA\include""
+				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;"..\..\..\..\..\..\..\Expat-2.0.0\source\lib";..\..\..\..\..\..\CASA\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -125,7 +125,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-DSECURITY_WIN32 -D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;&quot;..\..\..\..\..\..\..\Expat-2.0.0\source\lib&quot;;&quot;c:\Program Files\Novell\CASA\include&quot;"
+				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;&quot;..\..\..\..\..\..\..\Expat-2.0.0\source\lib&quot;;..\..\..\..\..\..\CASA\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -178,7 +178,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="mkdir \&quot;Program Files&quot;\novell\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\lib\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\etc\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\etc\auth\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\etc\auth\mechanisms\&#x0D;&#x0A;copy Krb5Authenticate.conf \&quot;Program Files&quot;\novell\casa\etc\auth\mechanisms\Krb5Authenticate.conf&#x0D;&#x0A;copy $(OutDir)\krb5mech.dll \&quot;Program Files&quot;\novell\casa\lib\krb5mech.dll&#x0D;&#x0A;"
+				CommandLine=""
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/CASA-auth-token/client/library/mechanisms/pwd/windows/pwd.vcproj b/CASA-auth-token/client/library/mechanisms/pwd/windows/pwd.vcproj
index 2ef12685..c8517169 100644
--- a/CASA-auth-token/client/library/mechanisms/pwd/windows/pwd.vcproj
+++ b/CASA-auth-token/client/library/mechanisms/pwd/windows/pwd.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;&quot;..\..\..\..\..\..\..\Expat-2.0.0\source\lib&quot;;&quot;c:\Program Files\Novell\CASA\include&quot;"
+				AdditionalIncludeDirectories=".\;..\;..\..\;..\..\..\;..\..\..\include;..\..\..\include\windows;..\..\..\..\..\..\CASA\include;..\..\..\..\..\..\..\..\CASA\micasadk\Release"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -67,7 +67,7 @@
 				AdditionalDependencies="micasa.lib"
 				OutputFile="$(OutDir)/pwmech.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\Program Files\novell\CASA\lib"
+				AdditionalLibraryDirectories="..\..\..\..\..\..\CASA\micasadk\Release"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/pw.pdb"
@@ -126,7 +126,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				AdditionalIncludeDirectories=".\;..\;..\..\..;..\..\..\..\include;&quot;..\..\..\..\..\..\..\Expat-2.0.0\source\lib&quot;;&quot;c:\Program Files\Novell\CASA\include&quot;"
+				AdditionalIncludeDirectories=".\;..\;..\..\;..\..\..\;..\..\..\include;..\..\..\include\windows;..\..\..\..\..\..\CASA\include;..\..\..\..\..\..\..\..\CASA\micasadk\Release"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -149,7 +149,7 @@
 				AdditionalDependencies="micasa.lib"
 				OutputFile="$(OutDir)/pwmech.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="C:\Program Files\novell\CASA\lib"
+				AdditionalLibraryDirectories="..\..\..\..\..\..\CASA\micasadk\Release"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="true"
 				SubSystem="0"
@@ -180,7 +180,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="mkdir \&quot;Program Files&quot;\novell\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\lib\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\etc\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\etc\auth\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\etc\auth\mechanisms\&#x0D;&#x0A;copy PwdAuthenticate.conf \&quot;Program Files&quot;\novell\casa\etc\auth\mechanisms\PwdAuthenticate.conf&#x0D;&#x0A;copy $(OutDir)\pwmech.dll \&quot;Program Files&quot;\novell\casa\lib\pwmech.dll&#x0D;&#x0A;"
+				CommandLine=""
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/CASA-auth-token/client/library/test/windows/test.vcproj b/CASA-auth-token/client/library/test/windows/test.vcproj
index 61c810b9..4203fdb2 100644
--- a/CASA-auth-token/client/library/test/windows/test.vcproj
+++ b/CASA-auth-token/client/library/test/windows/test.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\..\..\include;&quot;C:\Program Files\novell\CASA\include&quot;"
+				AdditionalIncludeDirectories=".\;..\..\..\include;..\..\..\..\..\CASA\micasadk\Release;..\..\..\..\..\CASA\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -66,7 +66,7 @@
 				AdditionalDependencies="casa_authtoken.lib ws2_32.lib"
 				OutputFile="$(OutDir)/test.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\novell\CASA\lib&quot;;&quot;C:\Dev\casa\CASA-auth-token\client\lib\windows&quot;"
+				AdditionalLibraryDirectories="..\..\..\lib\windows"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/test.pdb"
 				SubSystem="1"
@@ -124,7 +124,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="-D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				AdditionalIncludeDirectories=".\;..\..\..\include;&quot;C:\Program Files\novell\CASA\include&quot;"
+				AdditionalIncludeDirectories=".\;..\..\..\include;..\..\..\..\..\CASA\micasadk\Release;..\..\..\..\..\CASA\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -146,7 +146,7 @@
 				AdditionalDependencies="casa_authtoken.lib ws2_32.lib"
 				OutputFile="$(OutDir)/test.exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\novell\CASA\lib&quot;"
+				AdditionalLibraryDirectories="..\..\..\lib\windows"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/CASA-auth-token/client/library/windows/client.vcproj b/CASA-auth-token/client/library/windows/client.vcproj
index bf039518..5d746085 100644
--- a/CASA-auth-token/client/library/windows/client.vcproj
+++ b/CASA-auth-token/client/library/windows/client.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D &quot;XML_STATIC&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;\Program Files\Microsoft Platform SDK\include&quot;;&quot;\Program Files\novell\casa\include&quot;;&quot;C:\Dev\Expat-2.0.0\Source\lib&quot;"
+				AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;\Program Files\Microsoft Platform SDK\include&quot;;&quot;\Program Files\novell\casa\include&quot;;&quot;..\..\..\..\..\Expat-2.0.0\Source\lib&quot;;..\..\..\..\CASA\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -69,7 +69,7 @@
 				AdditionalDependencies="ws2_32.lib winhttp.lib libexpatml.lib micasa.lib shlwapi.lib"
 				OutputFile="$(OutDir)/casa_authtoken.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;\Program Files\Microsoft Platform SDK\lib&quot;;&quot;\Program Files\Novell\CASA\lib&quot;;&quot;C:\Dev\Expat-2.0.0\StaticLibs&quot;"
+				AdditionalLibraryDirectories="&quot;\Program Files\Microsoft Platform SDK\lib&quot;;&quot;\Program Files\Novell\CASA\lib&quot;;&quot;..\..\..\..\..\Expat-2.0.0\StaticLibs&quot;;..\..\..\..\CASA\lib\Release;..\..\..\..\CASA\micasadk\Release"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="true"
@@ -130,7 +130,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D &quot;XML_STATIC&quot; /D &quot;_CRT_SECURE_NO_DEPRECATE&quot;"
-				AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;\Program Files\Microsoft Platform SDK\include&quot;;&quot;\Program Files\novell\casa\include&quot;;&quot;C:\Dev\Expat-2.0.0\Source\lib&quot;"
+				AdditionalIncludeDirectories=".;..\;..\..\include;..\..\include\windows;&quot;\Program Files\Microsoft Platform SDK\include&quot;;&quot;\Program Files\novell\casa\include&quot;;&quot;..\..\..\..\..\Expat-2.0.0\Source\lib&quot;;..\..\..\..\CASA\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -153,7 +153,7 @@
 				AdditionalDependencies="ws2_32.lib winhttp.lib libexpatml.lib micasa.lib shlwapi.lib"
 				OutputFile="$(OutDir)/casa_authtoken.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;\Program Files\Microsoft Platform SDK\lib&quot;;&quot;\Program Files\Novell\CASA\lib&quot;;&quot;C:\Dev\Expat-2.0.0\StaticLibs&quot;"
+				AdditionalLibraryDirectories="&quot;\Program Files\Microsoft Platform SDK\lib&quot;;&quot;\Program Files\Novell\CASA\lib&quot;;&quot;..\..\..\..\..\Expat-2.0.0\StaticLibs&quot;;..\..\..\..\CASA\lib\Release;..\..\..\..\CASA\micasadk\Release"
 				IgnoreDefaultLibraryNames="libc"
 				GenerateDebugInformation="true"
 				SubSystem="0"
@@ -185,7 +185,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="mkdir \&quot;Program Files&quot;\novell\&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa&#x0D;&#x0A;mkdir \&quot;Program Files&quot;\novell\casa\lib\&#x0D;&#x0A;copy $(OutDir)\authtoken.dll \&quot;Program Files&quot;\novell\casa\lib\authtoken.dll&#x0D;&#x0A;copy $(SolutionDir)\client\windows\authtoken.lib \&quot;Program Files&quot;\novell\casa\lib\authtoken.lib&#x0D;&#x0A;"
+				CommandLine=""
 			/>
 		</Configuration>
 	</Configurations>