diff --git a/auth_token/client/mechanisms/pwd/pwd.vcproj b/auth_token/client/mechanisms/pwd/pwd.vcproj
index b948df27..ebc6fd50 100644
--- a/auth_token/client/mechanisms/pwd/pwd.vcproj
+++ b/auth_token/client/mechanisms/pwd/pwd.vcproj
@@ -12,14 +12,14 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)client\mechanisms\pwd\win32\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)client\mechanisms\pwd\win32\$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)client\mechanisms\pwd\windows\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)client\mechanisms\pwd\windows\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="win32;.;..\..;..\..\..\..\include"
+				AdditionalIncludeDirectories="windows;.;..\..;..\..\..\..\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -73,13 +73,13 @@ copy $(OutDir)\pwmech.dll \&quot;Program Files&quot;\novell\casa\lib\pwmech.dll
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)client\mechanisms\pwd\win32\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)client\mechanisms\pwd\win32\$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)client\mechanisms\pwd\windows\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)client\mechanisms\pwd\windows\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="win32;.;..\..;..\..\..\..\include"
+				AdditionalIncludeDirectories="windows;.;..\..;..\..\..\..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="4"
 				UsePrecompiledHeader="0"
@@ -139,7 +139,7 @@ copy $(OutDir)\pwmech.dll \&quot;Program Files&quot;\novell\casa\lib\pwmech.dll
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath=".\win32\dllsup.c">
+				RelativePath=".\windows\dllsup.c">
 			</File>
 			<File
 				RelativePath=".\get.c">
@@ -148,13 +148,14 @@ copy $(OutDir)\pwmech.dll \&quot;Program Files&quot;\novell\casa\lib\pwmech.dll
 				RelativePath=".\interface.c">
 			</File>
 			<File
-				RelativePath=".\win32\platform.c">
+				RelativePath=".\windows\platform.c">
 			</File>
 			<File
-				RelativePath=".\PwdAuthenticate.conf">
+				RelativePath=".\PwdAuthenticate.conf"
+				DeploymentContent="TRUE">
 			</File>
 			<File
-				RelativePath=".\win32\pwmech.def">
+				RelativePath=".\windows\pwmech.def">
 			</File>
 			<File
 				RelativePath=".\util.c">
@@ -168,7 +169,7 @@ copy $(OutDir)\pwmech.dll \&quot;Program Files&quot;\novell\casa\lib\pwmech.dll
 				RelativePath=".\internal.h">
 			</File>
 			<File
-				RelativePath=".\win32\platform.h">
+				RelativePath=".\windows\platform.h">
 			</File>
 		</Filter>
 		<Filter