diff --git a/CASA-auth-token/client/lib/mechanisms/krb5/windows/Makefile.am b/CASA-auth-token/client/lib/mechanisms/krb5/windows/Makefile.am
index d7bb146f..37864793 100644
--- a/CASA-auth-token/client/lib/mechanisms/krb5/windows/Makefile.am
+++ b/CASA-auth-token/client/lib/mechanisms/krb5/windows/Makefile.am
@@ -41,11 +41,11 @@ all-am: $(TARGET_FILE)
 .PHONY: $TARGET_FILE) devenv
 
 devenv:
-	@if ! test -x "$(VSINSTALLDIR)/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi
+	@if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi
 
 $(TARGET_FILE): devenv
 	@rm -f $(LOG_FILE) $@
-	@CMD='"$(VSINSTALLDIR)/devenv.exe" ../../../../auth.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \
+	@CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" ../../../../authclient.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \
 	echo $$CMD; \
 	if eval $$CMD; then \
 		ls -l $(TARGET_CFG)/$(TARGET_FILE); \
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/windows/Makefile.am b/CASA-auth-token/client/lib/mechanisms/pwd/windows/Makefile.am
index fcf613f3..ddb3d416 100644
--- a/CASA-auth-token/client/lib/mechanisms/pwd/windows/Makefile.am
+++ b/CASA-auth-token/client/lib/mechanisms/pwd/windows/Makefile.am
@@ -41,11 +41,11 @@ all-am: $(TARGET_FILE)
 .PHONY: $TARGET_FILE) devenv
 
 devenv:
-	@if ! test -x "$(VSINSTALLDIR)/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi
+	@if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi
 
 $(TARGET_FILE): devenv
 	@rm -f $(LOG_FILE) $@
-	@CMD='"$(VSINSTALLDIR)/devenv.exe" ../../../../auth.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \
+	@CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" ../../../../authclient.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \
 	echo $$CMD; \
 	if eval $$CMD; then \
 		ls -l $(TARGET_CFG)/$(TARGET_FILE); \
diff --git a/CASA-auth-token/client/lib/mechanisms/pwd/windows/pwd.vcproj b/CASA-auth-token/client/lib/mechanisms/pwd/windows/pwd.vcproj
index 8c4e6fe2..28b431f9 100644
--- a/CASA-auth-token/client/lib/mechanisms/pwd/windows/pwd.vcproj
+++ b/CASA-auth-token/client/lib/mechanisms/pwd/windows/pwd.vcproj
@@ -101,8 +101,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)client\mechanisms\pwd\windows\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)client\mechanisms\pwd\windows\$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)lib\mechanisms\pwd\windows\$(ConfigurationName)"
+			IntermediateDirectory="$(SolutionDir)lib\mechanisms\pwd\windows\$(ConfigurationName)"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
diff --git a/CASA-auth-token/client/lib/windows/Makefile.am b/CASA-auth-token/client/lib/windows/Makefile.am
index 4f0e0673..889e5ead 100644
--- a/CASA-auth-token/client/lib/windows/Makefile.am
+++ b/CASA-auth-token/client/lib/windows/Makefile.am
@@ -41,11 +41,11 @@ all-am: $(TARGET_FILE)
 .PHONY: $TARGET_FILE) devenv
 
 devenv:
-	@if ! test -x "$(VSINSTALLDIR)/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi
+	@if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi
 
 $(TARGET_FILE): devenv
 	@rm -f $(LOG_FILE) $@
-	@CMD='"$(VSINSTALLDIR)/devenv.exe" ../../auth.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \
+	@CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" ../../authclient.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \
 	echo $$CMD; \
 	if eval $$CMD; then \
 		ls -l $(TARGET_CFG)/$(TARGET_FILE); \
diff --git a/CASA-auth-token/client/package/windows/authtokenclient_msi/Makefile.am b/CASA-auth-token/client/package/windows/authtokenclient_msi/Makefile.am
index c97ba445..691d3343 100644
--- a/CASA-auth-token/client/package/windows/authtokenclient_msi/Makefile.am
+++ b/CASA-auth-token/client/package/windows/authtokenclient_msi/Makefile.am
@@ -41,11 +41,11 @@ LOG_FILE = $(PACKAGE).log
 package: $(TARGET_FILE)
 
 devenv:
-	@if ! test -x "$(VSINSTALLDIR)/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi
+	@if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi
 
 $(TARGET_FILE): devenv
 	@rm -f $(LOG_FILE) $@
-	@CMD='"$(VSINSTALLDIR)/devenv.exe" ../../../auth.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \
+	@CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" ../../../authclient.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \
 	echo $$CMD; \
 	if eval $$CMD; then \
 		ls -l $(TARGET_CFG)/$(TARGET_FILE); \
diff --git a/CASA-auth-token/client/package/windows/authtokenclient_msm/Makefile.am b/CASA-auth-token/client/package/windows/authtokenclient_msm/Makefile.am
index a3982068..a45e3744 100644
--- a/CASA-auth-token/client/package/windows/authtokenclient_msm/Makefile.am
+++ b/CASA-auth-token/client/package/windows/authtokenclient_msm/Makefile.am
@@ -41,11 +41,11 @@ LOG_FILE = $(PACKAGE).log
 package: $(TARGET_FILE)
 
 devenv:
-	@if ! test -x "$(VSINSTALLDIR)/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi
+	@if ! test -x "$(VSINSTALLDIR)/Common7/IDE/devenv.exe"; then echo "Error: Microsoft Visual Studio .NET is currently required to build MSI and MSM packages"; exit 1; fi
 
 $(TARGET_FILE): devenv
 	@rm -f $(LOG_FILE) $@
-	@CMD='"$(VSINSTALLDIR)/devenv.exe" ../../../auth.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \
+	@CMD='"$(VSINSTALLDIR)/Common7/IDE/devenv.exe" ../../../authclient.sln /build $(TARGET_CFG) /project $(PACKAGE) /out $(LOG_FILE)'; \
 	echo $$CMD; \
 	if eval $$CMD; then \
 		ls -l $(TARGET_CFG)/$(TARGET_FILE); \