diff --git a/CASA-auth-token/client/authclient.sln b/CASA-auth-token/client/authclient.sln
index d0615dc7..68a6d7db 100644
--- a/CASA-auth-token/client/authclient.sln
+++ b/CASA-auth-token/client/authclient.sln
@@ -9,13 +9,13 @@ Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "authtokenclient_msm", "pack
 EndProject
 Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "authtokenclient_msi", "package\windows\authtokenclient_msi\authtokenclient_msi.vdproj", "{7B174382-8BE8-4F2A-A122-4FCEE849A776}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "lib\windows\client.vcproj", "{7BD9A5DB-DE7D-40B7-A397-04182DC2F632}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "library\windows\client.vcproj", "{7BD9A5DB-DE7D-40B7-A397-04182DC2F632}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "krb5", "lib\mechanisms\krb5\windows\krb5.vcproj", "{5499F624-F371-4559-B4C2-A484BCE892FD}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "krb5", "library\mechanisms\krb5\windows\krb5.vcproj", "{5499F624-F371-4559-B4C2-A484BCE892FD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pwd", "lib\mechanisms\pwd\windows\pwd.vcproj", "{CBD168E8-1D5F-4D75-9E2D-6970CCEB652E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pwd", "library\mechanisms\pwd\windows\pwd.vcproj", "{CBD168E8-1D5F-4D75-9E2D-6970CCEB652E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "lib\test\windows\test.vcproj", "{6034EBF1-0838-45C4-A538-A41A31EC8F46}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "library\test\windows\test.vcproj", "{6034EBF1-0838-45C4-A538-A41A31EC8F46}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7BD9A5DB-DE7D-40B7-A397-04182DC2F632} = {7BD9A5DB-DE7D-40B7-A397-04182DC2F632}
 	EndProjectSection
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 074b443b..13083609 100644
--- a/CASA-auth-token/client/library/mechanisms/krb5/windows/krb5.vcproj
+++ b/CASA-auth-token/client/library/mechanisms/krb5/windows/krb5.vcproj
@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="krb5"
 	ProjectGUID="{5499F624-F371-4559-B4C2-A484BCE892FD}"
+	RootNamespace="krb5"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -16,8 +17,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)lib\mechanisms\krb5\windows\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)lib\mechanisms\krb5\windows\$(ConfigurationName)"
+			OutputDirectory="..\windows\$(ConfigurationName)"
+			IntermediateDirectory="..\windows\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -100,8 +101,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)lib\mechanisms\krb5\windows\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)lib\mechanisms\krb5\windows\$(ConfigurationName)"
+			OutputDirectory="..\windows\$(ConfigurationName)"
+			IntermediateDirectory="..\windows\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
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 28b431f9..2ef12685 100644
--- a/CASA-auth-token/client/library/mechanisms/pwd/windows/pwd.vcproj
+++ b/CASA-auth-token/client/library/mechanisms/pwd/windows/pwd.vcproj
@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="pwd"
 	ProjectGUID="{CBD168E8-1D5F-4D75-9E2D-6970CCEB652E}"
+	RootNamespace="pwd"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -16,8 +17,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)lib\mechanisms\pwd\windows\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)lib\mechanisms\pwd\windows\$(ConfigurationName)"
+			OutputDirectory="..\windows\$(ConfigurationName)"
+			IntermediateDirectory="..\windows\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -101,8 +102,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)lib\mechanisms\pwd\windows\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)lib\mechanisms\pwd\windows\$(ConfigurationName)"
+			OutputDirectory="..\windows\$(ConfigurationName)"
+			IntermediateDirectory="..\windows\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
diff --git a/CASA-auth-token/client/library/windows/client.vcproj b/CASA-auth-token/client/library/windows/client.vcproj
index 88407e6a..bf039518 100644
--- a/CASA-auth-token/client/library/windows/client.vcproj
+++ b/CASA-auth-token/client/library/windows/client.vcproj
@@ -17,8 +17,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)lib\windows\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)lib\windows\$(ConfigurationName)"
+			OutputDirectory="..\windows\$(ConfigurationName)"
+			IntermediateDirectory="..\windows\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
@@ -101,13 +101,13 @@
 			/>
 			<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)\lib\windows\authtoken.lib \&quot;Program Files&quot;\novell\casa\lib\authtoken.lib&#x0D;&#x0A;"
+				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)\casa_authtoken.dll \&quot;Program Files&quot;\novell\casa\lib\casa_authtoken.dll&#x0D;&#x0A;copy $(SolutionDir)\lib\windows\casa_authtoken.lib \&quot;Program Files&quot;\novell\casa\lib\casa_authtoken.lib&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)lib\windows\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)lib\windows\$(ConfigurationName)"
+			OutputDirectory="..\windows\$(ConfigurationName)"
+			IntermediateDirectory="..\windows\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
diff --git a/CASA-auth-token/client/package/windows/authtokenclient_msm/authtokenclient_msm.vdproj b/CASA-auth-token/client/package/windows/authtokenclient_msm/authtokenclient_msm.vdproj
index 0e8ed4d0..a1701b6d 100644
--- a/CASA-auth-token/client/package/windows/authtokenclient_msm/authtokenclient_msm.vdproj
+++ b/CASA-auth-token/client/package/windows/authtokenclient_msm/authtokenclient_msm.vdproj
@@ -164,7 +164,7 @@
         {
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4E73B42DD7BB4E5C8B309F197D94C7F2"
             {
-            "SourcePath" = "8:..\\..\\..\\lib\\client.conf"
+            "SourcePath" = "8:..\\..\\..\\library\\client.conf"
             "TargetName" = "8:client.conf"
             "Tag" = "8:"
             "Folder" = "8:_24DA90392089420889094EC07EB4F28C"
@@ -224,7 +224,7 @@
             }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BB044A7714A346268747D2E57B364BD9"
             {
-            "SourcePath" = "8:..\\..\\..\\lib\\mechanisms\\krb5\\windows\\Krb5Authenticate.conf"
+            "SourcePath" = "8:..\\..\\..\\library\\mechanisms\\krb5\\windows\\Krb5Authenticate.conf"
             "TargetName" = "8:Krb5Authenticate.conf"
             "Tag" = "8:"
             "Folder" = "8:_DEA051CA331E4FEA83D99711FB584664"
@@ -244,7 +244,7 @@
             }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F0C46E8F1B5048179188E62D91BA91EB"
             {
-            "SourcePath" = "8:..\\..\\..\\lib\\mechanisms\\pwd\\windows\\PwdAuthenticate.conf"
+            "SourcePath" = "8:..\\..\\..\\library\\mechanisms\\pwd\\windows\\PwdAuthenticate.conf"
             "TargetName" = "8:PwdAuthenticate.conf"
             "Tag" = "8:"
             "Folder" = "8:_DEA051CA331E4FEA83D99711FB584664"
@@ -467,7 +467,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_50C15B4896B94AAD8CF7A676F541BD89"
             {
-            "SourcePath" = "8:..\\..\\..\\lib\\mechanisms\\krb5\\windows\\Debug\\krb5mech.dll"
+            "SourcePath" = "8:..\\..\\..\\library\\mechanisms\\krb5\\windows\\Debug\\krb5mech.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
@@ -495,7 +495,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_75519C9025D94CC496F276E698CE3AF8"
             {
-            "SourcePath" = "8:..\\..\\..\\lib\\windows\\Debug\\casa_authtoken.dll"
+            "SourcePath" = "8:..\\..\\..\\library\\windows\\Debug\\casa_authtoken.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_E092F841E4D04920B053C3F6A5151BA2"
@@ -523,7 +523,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_8E623C85FD4143F3B09460457E8ED6CA"
             {
-            "SourcePath" = "8:..\\..\\..\\lib\\mechanisms\\pwd\\windows\\Debug\\pwmech.dll"
+            "SourcePath" = "8:..\\..\\..\\library\\mechanisms\\pwd\\windows\\Debug\\pwmech.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_01897726E7804A3B875B67A1C2692147"
@@ -551,7 +551,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C1C37E2154994C29B02FDD9C90635B26"
             {
-            "SourcePath" = "8:..\\..\\..\\lib\\windows\\Debug\\casa_authtoken.dll"
+            "SourcePath" = "8:..\\..\\..\\library\\windows\\Debug\\casa_authtoken.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_01897726E7804A3B875B67A1C2692147"