[shibboleth-sp2] 06/89: SSPCPP-689 Move VC files into Projects folders

Ferenc Wágner wferi at moszumanska.debian.org
Thu Sep 1 09:24:03 UTC 2016 

This is an automated email from the git hooks/post-receive script.

wferi pushed a commit to branch master
in repository shibboleth-sp2.

commit b94c16f41779d7cf66c2c804ec81735b1699472c
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Sun May 1 13:28:47 2016 +0100

    SSPCPP-689 Move VC files into Projects folders
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-689
    
    As a result we also remove a lot from the .gitignore files in
    the project folders.
---
 .gitignore                                         |  31 +-
 Shibboleth.sln => Projects/VC10/Shibboleth.sln     | 156 +++++----
 {msi/WiX => Projects/VC10/Wix}/Installer.vcxproj   |  60 ++--
 {adfs => Projects/VC10/adfs}/adfs-lite.vcxproj     |  34 +-
 {adfs => Projects/VC10/adfs}/adfs.vcxproj          |  34 +-
 .../VC10/apache}/mod_shib13.vcxproj                |  36 +-
 .../VC10/apache}/mod_shib20.vcxproj                |  36 +-
 .../VC10/apache}/mod_shib22.vcxproj                |  36 +-
 .../VC10/apache}/mod_shib24.vcxproj                |  36 +-
 .../VC10/fastcgi}/shibauthorizer.vcxproj           |  31 +-
 .../VC10/fastcgi}/shibresponder.vcxproj            |  31 +-
 .../VC10/isapi_shib}/isapi_shib.vcxproj            |  33 +-
 .../VC10/memcache-store}/memcache-store.vcxproj    |  37 ++-
 .../VC10/nsapi_shib}/nsapi_shib.vcxproj            |  35 +-
 .../VC10/odbc-store}/odbc-store.vcxproj            |  34 +-
 .../VC10/plugins}/plugins-lite.vcxproj             |  37 ++-
 {plugins => Projects/VC10/plugins}/plugins.vcxproj |  45 +--
 .../VC10/plugins}/plugins.vcxproj.filters          |   0
 {shibd => Projects/VC10/shibd}/shibd.vcxproj       |  36 +-
 .../VC10/shibsp}/shibsp-lite.vcxproj               | 237 ++++++-------
 .../VC10/shibsp}/shibsp-lite.vcxproj.filters       |   0
 Projects/VC10/shibsp/shibsp.vcxproj                | 367 +++++++++++++++++++++
 .../VC10/shibsp}/shibsp.vcxproj.filters            |   0
 {util => Projects/VC10/util}/mdquery.vcxproj       |  31 +-
 {util => Projects/VC10/util}/resolvertest.vcxproj  |  31 +-
 Projects/VC10/wix/MergeModules.vcxproj             | 115 +++++++
 adfs/.gitignore                                    |   9 -
 apache/.gitignore                                  |   8 +-
 fastcgi/.gitignore                                 |   6 -
 isapi_shib/.gitignore                              |   4 -
 memcache-store/.gitignore                          |   4 -
 msi/.gitignore                                     |   1 -
 msi/WiX/MergeModules/MergeModules.vcxproj          | 105 ------
 nsapi_shib/.gitignore                              |   3 -
 odbc-store/.gitignore                              |   4 -
 plugins/.gitignore                                 |   4 +-
 shibd/.gitignore                                   |   4 -
 shibsp/shibsp.vcxproj                              | 365 --------------------
 38 files changed, 1056 insertions(+), 1020 deletions(-)

diff --git a/.gitignore b/.gitignore
index 45b5f55..b8a456d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,14 +15,17 @@
 *.wixpdb
 *.msi
 *.wixlib
+*.sdf
+*.opensdf
+*.suo
 *~
 *.#*
 .*.swp
 .DS_store
 *.vcxproj.user
-Debug
-Release
-x64
+**/Debug
+**/Release
+**/x64
 # Simulated Subversion default ignores end here
 # The contents of the svn:ignore property on the branch root.
 /aclocal.m4
@@ -46,12 +49,26 @@ x64
 /.autotools
 /.cproject
 /.project
-/*.suo
 /Portfile
 /pkginfo
 /*.gz
-/*.sdf
-/*.opensdf
-/ipch
 /build-aux
 /build
+
+Projects/VC??/adfs/adfs-lite-Debug/
+Projects/VC??/adfs/adfs-lite-Release/
+Projects/VC??/apache/mod_shib_20-Debug/
+Projects/VC??/apache/mod_shib_20-Release/
+Projects/VC??/apache/mod_shib_22-Debug/
+Projects/VC??/apache/mod_shib_22-Release/
+Projects/VC??/apache/mod_shib_24-Debug/
+Projects/VC??/apache/mod_shib_24-Release/
+Projects/VC??/fastcgi/shibauthorizer-Debug/
+Projects/VC??/fastcgi/shibauthorizer-Release/
+Projects/VC??/fastcgi/shibresponder-Debug/
+Projects/VC??/fastcgi/shibresponder-Release/
+Projects/VC??/ipch/
+Projects/VC??/plugins/plugins-lite-Debug/
+Projects/VC??/plugins/plugins-lite-Release/
+Projects/VC??/shibsp/shibsp-lite-Debug/
+Projects/VC??/shibsp/shibsp-lite-Release/
\ No newline at end of file
diff --git a/Shibboleth.sln b/Projects/VC10/Shibboleth.sln
similarity index 80%
rename from Shibboleth.sln
rename to Projects/VC10/Shibboleth.sln
index 9f2e620..f30dd9d 100644
--- a/Shibboleth.sln
+++ b/Projects/VC10/Shibboleth.sln
@@ -1,7 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
-MinimumVisualStudioVersion = 10.0.40219.1
+# Visual Studio 2010
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server Modules", "Server Modules", "{26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}"
@@ -19,88 +17,88 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fastcgi", "fastcgi", "{8E1A
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Schemas", "Schemas", "{0F172F71-BDD7-44D1-9147-061DC20683BD}"
 	ProjectSection(SolutionItems) = preProject
-		schemas\catalog.xml.in = schemas\catalog.xml.in
-		schemas\Makefile.am = schemas\Makefile.am
-		schemas\shibboleth-2.0-afp-mf-basic.xsd = schemas\shibboleth-2.0-afp-mf-basic.xsd
-		schemas\shibboleth-2.0-afp-mf-saml.xsd = schemas\shibboleth-2.0-afp-mf-saml.xsd
-		schemas\shibboleth-2.0-afp.xsd = schemas\shibboleth-2.0-afp.xsd
-		schemas\shibboleth-2.0-attribute-map.xsd = schemas\shibboleth-2.0-attribute-map.xsd
-		schemas\shibboleth-2.0-native-sp-config.xsd = schemas\shibboleth-2.0-native-sp-config.xsd
-		schemas\shibboleth-2.0-native-sp-protocols.xsd = schemas\shibboleth-2.0-native-sp-protocols.xsd
-		schemas\shibboleth-2.0-sp-notify.xsd = schemas\shibboleth-2.0-sp-notify.xsd
-		schemas\shibboleth-metadata-1.0.xsd = schemas\shibboleth-metadata-1.0.xsd
-		schemas\shibboleth.xsd = schemas\shibboleth.xsd
-		schemas\WS-Trust.xsd = schemas\WS-Trust.xsd
+		..\..\schemas\catalog.xml.in = ..\..\schemas\catalog.xml.in
+		..\..\schemas\Makefile.am = ..\..\schemas\Makefile.am
+		..\..\schemas\shibboleth-2.0-afp-mf-basic.xsd = ..\..\schemas\shibboleth-2.0-afp-mf-basic.xsd
+		..\..\schemas\shibboleth-2.0-afp-mf-saml.xsd = ..\..\schemas\shibboleth-2.0-afp-mf-saml.xsd
+		..\..\schemas\shibboleth-2.0-afp.xsd = ..\..\schemas\shibboleth-2.0-afp.xsd
+		..\..\schemas\shibboleth-2.0-attribute-map.xsd = ..\..\schemas\shibboleth-2.0-attribute-map.xsd
+		..\..\schemas\shibboleth-2.0-native-sp-config.xsd = ..\..\schemas\shibboleth-2.0-native-sp-config.xsd
+		..\..\schemas\shibboleth-2.0-native-sp-protocols.xsd = ..\..\schemas\shibboleth-2.0-native-sp-protocols.xsd
+		..\..\schemas\shibboleth-2.0-sp-notify.xsd = ..\..\schemas\shibboleth-2.0-sp-notify.xsd
+		..\..\schemas\shibboleth-metadata-1.0.xsd = ..\..\schemas\shibboleth-metadata-1.0.xsd
+		..\..\schemas\shibboleth.xsd = ..\..\schemas\shibboleth.xsd
+		..\..\schemas\WS-Trust.xsd = ..\..\schemas\WS-Trust.xsd
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{2543BCFE-B3D7-4D08-AAA5-2E284903890E}"
 	ProjectSection(SolutionItems) = preProject
-		configs\accessError.html = configs\accessError.html
-		configs\apache.config.in = configs\apache.config.in
-		configs\apache2.config.in = configs\apache2.config.in
-		configs\apache22.config.in = configs\apache22.config.in
-		configs\apache24.config.in = configs\apache24.config.in
-		configs\attrChecker.html = configs\attrChecker.html
-		configs\attribute-map.xml = configs\attribute-map.xml
-		configs\attribute-policy.xml = configs\attribute-policy.xml
-		configs\bindingTemplate.html = configs\bindingTemplate.html
-		configs\console.logger = configs\console.logger
-		configs\discoveryTemplate.html = configs\discoveryTemplate.html
-		configs\example-metadata.xml = configs\example-metadata.xml
-		configs\example-shibboleth2.xml = configs\example-shibboleth2.xml
-		configs\globalLogout.html = configs\globalLogout.html
-		configs\keygen.bat = configs\keygen.bat
-		configs\keygen.sh = configs\keygen.sh
-		configs\localLogout.html = configs\localLogout.html
-		configs\Makefile.am = configs\Makefile.am
-		configs\metadataError.html = configs\metadataError.html
-		configs\metagen.sh = configs\metagen.sh
-		configs\native.logger.in = configs\native.logger.in
-		configs\partialLogout.html = configs\partialLogout.html
-		configs\postTemplate.html = configs\postTemplate.html
-		configs\protocols.xml = configs\protocols.xml
-		configs\security-policy.xml = configs\security-policy.xml
-		configs\SetService32.bat = configs\SetService32.bat
-		configs\SetService64.bat = configs\SetService64.bat
-		configs\shibboleth2.xml = configs\shibboleth2.xml
-		configs\shibd-debian.in = configs\shibd-debian.in
-		configs\shibd-osx.plist.in = configs\shibd-osx.plist.in
-		configs\shibd-redhat.in = configs\shibd-redhat.in
-		configs\shibd-suse.in = configs\shibd-suse.in
-		configs\shibd.logger.in = configs\shibd.logger.in
-		configs\sslError.html = configs\sslError.html
-		configs\syslog.logger = configs\syslog.logger
-		configs\upgrade.xsl = configs\upgrade.xsl
-		configs\win-shibboleth2.xml = configs\win-shibboleth2.xml
-		configs\xsltproc.js = configs\xsltproc.js
+		..\..\configs\accessError.html = ..\..\configs\accessError.html
+		..\..\configs\apache.config.in = ..\..\configs\apache.config.in
+		..\..\configs\apache2.config.in = ..\..\configs\apache2.config.in
+		..\..\configs\apache22.config.in = ..\..\configs\apache22.config.in
+		..\..\configs\apache24.config.in = ..\..\configs\apache24.config.in
+		..\..\configs\attrChecker.html = ..\..\configs\attrChecker.html
+		..\..\configs\attribute-map.xml = ..\..\configs\attribute-map.xml
+		..\..\configs\attribute-policy.xml = ..\..\configs\attribute-policy.xml
+		..\..\configs\bindingTemplate.html = ..\..\configs\bindingTemplate.html
+		..\..\configs\console.logger = ..\..\configs\console.logger
+		..\..\configs\discoveryTemplate.html = ..\..\configs\discoveryTemplate.html
+		..\..\configs\example-metadata.xml = ..\..\configs\example-metadata.xml
+		..\..\configs\example-shibboleth2.xml = ..\..\configs\example-shibboleth2.xml
+		..\..\configs\globalLogout.html = ..\..\configs\globalLogout.html
+		..\..\configs\keygen.bat = ..\..\configs\keygen.bat
+		..\..\configs\keygen.sh = ..\..\configs\keygen.sh
+		..\..\configs\localLogout.html = ..\..\configs\localLogout.html
+		..\..\configs\Makefile.am = ..\..\configs\Makefile.am
+		..\..\configs\metadataError.html = ..\..\configs\metadataError.html
+		..\..\configs\metagen.sh = ..\..\configs\metagen.sh
+		..\..\configs\native.logger.in = ..\..\configs\native.logger.in
+		..\..\configs\partialLogout.html = ..\..\configs\partialLogout.html
+		..\..\configs\postTemplate.html = ..\..\configs\postTemplate.html
+		..\..\configs\protocols.xml = ..\..\configs\protocols.xml
+		..\..\configs\security-policy.xml = ..\..\configs\security-policy.xml
+		..\..\configs\SetService32.bat = ..\..\configs\SetService32.bat
+		..\..\configs\SetService64.bat = ..\..\configs\SetService64.bat
+		..\..\configs\shibboleth2.xml = ..\..\configs\shibboleth2.xml
+		..\..\configs\shibd-debian.in = ..\..\configs\shibd-debian.in
+		..\..\configs\shibd-osx.plist.in = ..\..\configs\shibd-osx.plist.in
+		..\..\configs\shibd-redhat.in = ..\..\configs\shibd-redhat.in
+		..\..\configs\shibd-suse.in = ..\..\configs\shibd-suse.in
+		..\..\configs\shibd.logger.in = ..\..\configs\shibd.logger.in
+		..\..\configs\sslError.html = ..\..\configs\sslError.html
+		..\..\configs\syslog.logger = ..\..\configs\syslog.logger
+		..\..\configs\upgrade.xsl = ..\..\configs\upgrade.xsl
+		..\..\configs\win-shibboleth2.xml = ..\..\configs\win-shibboleth2.xml
+		..\..\configs\xsltproc.js = ..\..\configs\xsltproc.js
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{31B171C1-E06C-464F-A541-38724AB52D79}"
 	ProjectSection(SolutionItems) = preProject
-		m4\acinclude.m4 = m4\acinclude.m4
-		m4\acx_pthread.m4 = m4\acx_pthread.m4
-		m4\boost.m4 = m4\boost.m4
-		config_win32.h = config_win32.h
-		configure.ac = configure.ac
-		doxygen.am = doxygen.am
-		doxygen.cfg = doxygen.cfg
-		m4\doxygen.m4 = m4\doxygen.m4
-		Makefile.am = Makefile.am
-		shibboleth.spec.in = shibboleth.spec.in
+		..\..\m4\acinclude.m4 = ..\..\m4\acinclude.m4
+		..\..\m4\acx_pthread.m4 = ..\..\m4\acx_pthread.m4
+		..\..\m4\boost.m4 = ..\..\m4\boost.m4
+		..\..\config_win32.h = ..\..\config_win32.h
+		..\..\configure.ac = ..\..\configure.ac
+		..\..\doxygen.am = ..\..\doxygen.am
+		..\..\doxygen.cfg = ..\..\doxygen.cfg
+		..\..\m4\doxygen.m4 = ..\..\m4\doxygen.m4
+		..\..\Makefile.am = ..\..\Makefile.am
+		..\..\shibboleth.spec.in = ..\..\shibboleth.spec.in
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{6ED5E3E7-1B0E-43FB-A8D1-77A0FCAE9AC8}"
 	ProjectSection(SolutionItems) = preProject
-		doc\CREDITS.txt = doc\CREDITS.txt
-		doc\FASTCGI.LICENSE = doc\FASTCGI.LICENSE
-		doc\LICENSE.txt = doc\LICENSE.txt
-		doc\LOG4CPP.LICENSE = doc\LOG4CPP.LICENSE
-		doc\main.css = doc\main.css
-		doc\Makefile.am = doc\Makefile.am
-		doc\NOTICE.txt = doc\NOTICE.txt
-		doc\OPENSSL.LICENSE = doc\OPENSSL.LICENSE
-		doc\README.txt = doc\README.txt
-		doc\RELEASE.txt = doc\RELEASE.txt
+		..\..\doc\CREDITS.txt = ..\..\doc\CREDITS.txt
+		..\..\doc\FASTCGI.LICENSE = ..\..\doc\FASTCGI.LICENSE
+		..\..\doc\LICENSE.txt = ..\..\doc\LICENSE.txt
+		..\..\doc\LOG4CPP.LICENSE = ..\..\doc\LOG4CPP.LICENSE
+		..\..\doc\main.css = ..\..\doc\main.css
+		..\..\doc\Makefile.am = ..\..\doc\Makefile.am
+		..\..\doc\NOTICE.txt = ..\..\doc\NOTICE.txt
+		..\..\doc\OPENSSL.LICENSE = ..\..\doc\OPENSSL.LICENSE
+		..\..\doc\README.txt = ..\..\doc\README.txt
+		..\..\doc\RELEASE.txt = ..\..\doc\RELEASE.txt
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isapi_shib", "isapi_shib\isapi_shib.vcxproj", "{87C25D4E-8D19-4513-B0BA-BC668BC2DEE3}"
@@ -146,12 +144,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugins-lite", "plugins\plu
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installers", "Installers", "{BF389E01-8F97-4ECA-8C62-2DBB8F0480DD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeModules", "msi\WiX\MergeModules\MergeModules.vcxproj", "{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeModules", "Wix\MergeModules.vcxproj", "{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}"
 	ProjectSection(ProjectDependencies) = postProject
 		{81F0F7A6-DC36-46EF-957F-F9E81D4403F6} = {81F0F7A6-DC36-46EF-957F-F9E81D4403F6}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Installer", "msi\WiX\Installer.vcxproj", "{C2B1BB79-C88B-42B4-9AEC-170F91910F70}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Installer", "Wix\Installer.vcxproj", "{C2B1BB79-C88B-42B4-9AEC-170F91910F70}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1396D80A-8672-4224-9B02-95F3F4207CDB} = {1396D80A-8672-4224-9B02-95F3F4207CDB}
 		{D243B43E-728E-4F32-BDFF-B3A897037C6D} = {D243B43E-728E-4F32-BDFF-B3A897037C6D}
@@ -352,17 +350,17 @@ Global
 		{68E9568B-476C-4289-B93C-893432378ADC} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
 		{1396D80A-8672-4224-9B02-95F3F4207CDB} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
 		{B44C0852-83B8-4FB2-A86E-097C9C8256D0} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
+		{B44C0852-83B8-4FB2-A86E-097C9C8256D1} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
 		{666A63A7-983F-4C19-8411-207F24305197} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
 		{26D4FABF-ACDE-4947-9C4A-7AE1B50CD83A} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
 		{26D4FABF-ACDE-4947-9C4A-7AE1B50CD83B} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
+		{666A63A7-983F-4C19-8411-207F24305198} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
+		{A2140D6E-C2C6-4329-84E3-2F530CEBE445} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
+		{A2140D6E-C2C6-4329-84E3-2F530CEBE442} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
 		{F13141B6-6C87-40BB-8D4E-5CC56EBB4C5A} = {FED80230-119E-4B2F-9F53-D2660A5F022B}
 		{F13141B6-6C87-40BB-8D4E-5CC56EBB4C59} = {FED80230-119E-4B2F-9F53-D2660A5F022B}
 		{8CF7DDFA-EAA0-416E-853E-3DCB210C4AE0} = {8E1AF2CF-24E1-4983-8681-394D89DF9AD2}
 		{B2423DCE-048D-4BAA-9AB9-F5D1FCDD3D25} = {8E1AF2CF-24E1-4983-8681-394D89DF9AD2}
-		{666A63A7-983F-4C19-8411-207F24305198} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
-		{A2140D6E-C2C6-4329-84E3-2F530CEBE445} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
-		{B44C0852-83B8-4FB2-A86E-097C9C8256D1} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}
-		{A2140D6E-C2C6-4329-84E3-2F530CEBE442} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}
 		{EFF65B5B-85AB-4FD5-A217-7E6CA4219951} = {BF389E01-8F97-4ECA-8C62-2DBB8F0480DD}
 		{C2B1BB79-C88B-42B4-9AEC-170F91910F70} = {BF389E01-8F97-4ECA-8C62-2DBB8F0480DD}
 	EndGlobalSection
diff --git a/msi/WiX/Installer.vcxproj b/Projects/VC10/Wix/Installer.vcxproj
similarity index 52%
rename from msi/WiX/Installer.vcxproj
rename to Projects/VC10/Wix/Installer.vcxproj
index 5fbb6cc..ece3d98 100644
--- a/msi/WiX/Installer.vcxproj
+++ b/Projects/VC10/Wix/Installer.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -36,57 +36,61 @@
   <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" />
   </ImportGroup>
-  <Import Project="..\..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <NMakeBuildCommandLine>nmake /f Installer.make clean</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>cd ..\..\..\msi\Wix\
+nmake /f Installer.make clean</NMakeBuildCommandLine>
     <NMakeCleanCommandLine>del *.wixobj *.msi *.wixlib</NMakeCleanCommandLine>
     <NMakeReBuildCommandLine>nmake /f Installer.make clean</NMakeReBuildCommandLine>
     <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <NMakeBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) all32</NMakeBuildCommandLine>
-    <NMakeCleanCommandLine>del *86.wixobj
+    <NMakeBuildCommandLine>cd ..\..\..\msi\Wix\
+nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) all32</NMakeBuildCommandLine>
+    <NMakeCleanCommandLine>cd ..\..\..\msi\Wix\
+del *86.wixobj
 del *86.msi
 del *.wixlib
 del *x86.wixpdb</NMakeCleanCommandLine>
-    <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) rebuild32</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) rebuild32</NMakeReBuildCommandLine>
     <NMakePreprocessorDefinitions>
     </NMakePreprocessorDefinitions>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) all64</NMakeBuildCommandLine>
-    <NMakeCleanCommandLine>del *64.wixobj
+    <NMakeBuildCommandLine>cd ..\..\..\msi\Wix\
+nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) all64</NMakeBuildCommandLine>
+    <NMakeCleanCommandLine>cd ..\..\..\msi\Wix\
+del *64.wixobj
 del *64.msmi
 del *.wixlib
 del *64.wixpdb</NMakeCleanCommandLine>
-    <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) rebuild64</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\
+nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) rebuild64</NMakeReBuildCommandLine>
     <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
   </PropertyGroup>
   <ItemDefinitionGroup>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="Dialog.bmp" />
-    <None Include="Installer.make" />
-    <None Include="license.rtf" />
-    <None Include="ShibbolethSP-defs-x86.wxi" />
-    <None Include="ShibbolethSP-exe-x64.wxs">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="ShibbolethSP-exe-x86.wxs" />
-    <None Include="ShibbolethSP-gui.wxs" />
-    <None Include="ShibbolethSP-install-dlg.wxs" />
-    <None Include="ShibbolethSP-main-x64.wxs" />
-    <None Include="ShibbolethSP-main-x86.wxs" />
-    <None Include="ShibbolethSP-noarch.wxs" />
-    <None Include="ShibbolethSP-properties.wxi" />
-    <None Include="ShibbolethSP-registry-x64.wxs" />
-    <None Include="ShibbolethSP-registry-x86.wxs" />
-    <None Include="ShibbolethSP-update-dlg.wxs" />
-    <None Include="TopBanner.bmp" />
+    <None Include="H:\Perforce\devel\cpp-sp\msi\wix\Dialog.bmp" />
+    <None Include="..\..\..\msi\wix\Installer.make" />
+    <None Include="..\..\..\msi\wix\license.rtf" />
+    <None Include="..\..\..\msi\wix\ShibbolethSP-defs-x86.wxi" />
+    <None Include="..\..\..\msi\wix\ShibbolethSP-exe-x64.wxs"/>
+    <None Include="..\..\..\msi\wix\ShibbolethSP-exe-x86.wxs" />
+    <None Include="..\..\..\msi\wix\ShibbolethSP-gui.wxs" />
+    <None Include="..\..\..\msi\wix\ShibbolethSP-install-dlg.wxs" />
+    <None Include="..\..\..\msi\wix\ShibbolethSP-main-x64.wxs" />
+    <None Include="..\..\..\msi\wix\ShibbolethSP-main-x86.wxs" />
+    <None Include="..\..\..\msi\wix\ShibbolethSP-noarch.wxs" />
+    <None Include="..\..\..\msi\wix\ShibbolethSP-properties.wxi" />
+    <None Include="..\..\..\msi\wix\ShibbolethSP-registry-x64.wxs" />
+    <None Include="..\..\..\msi\wix\ShibbolethSP-registry-x86.wxs" />
+    <None Include="..\..\..\msi\wix\ShibbolethSP-update-dlg.wxs" />
+    <None Include="..\..\..\msi\wix\TopBanner.bmp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/adfs/adfs-lite.vcxproj b/Projects/VC10/adfs/adfs-lite.vcxproj
similarity index 82%
rename from adfs/adfs-lite.vcxproj
rename to Projects/VC10/adfs/adfs-lite.vcxproj
index 96d7521..1885037 100644
--- a/adfs/adfs-lite.vcxproj
+++ b/Projects/VC10/adfs/adfs-lite.vcxproj
@@ -58,19 +58,21 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\Build\VC10\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\Build\VC10\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -93,7 +95,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\adfs;..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -107,7 +109,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <DataExecutionPrevention>
@@ -120,7 +122,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\adfs;..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -134,7 +136,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <DataExecutionPrevention>
@@ -143,7 +145,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\adfs;..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -154,7 +156,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -168,7 +170,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\adfs;..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -179,7 +181,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -189,19 +191,19 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="adfs.cpp" />
+    <ClCompile Include="..\..\..\adfs\adfs.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="adfs.rc" />
+    <ResourceCompile Include="..\..\..\adfs\adfs.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\adfs\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\adfs\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp-lite.vcxproj">
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f7}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/adfs/adfs.vcxproj b/Projects/VC10/adfs/adfs.vcxproj
similarity index 80%
rename from adfs/adfs.vcxproj
rename to Projects/VC10/adfs/adfs.vcxproj
index 45272c7..b4ef4b8 100644
--- a/adfs/adfs.vcxproj
+++ b/Projects/VC10/adfs/adfs.vcxproj
@@ -58,17 +58,19 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\Build\vc10\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\Build\vc10\$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\Build\vc10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\Build\vc10\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -91,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\adfs;..\..\..;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -105,7 +107,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;saml2D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <DataExecutionPrevention>
@@ -118,7 +120,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\adfs;..\..\..;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -132,7 +134,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;saml2D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <DataExecutionPrevention>
@@ -141,7 +143,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\adfs;..\..\..;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -149,7 +151,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;saml2.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -163,7 +165,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\adfs;..\..\..;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -171,7 +173,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;saml2.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -181,19 +183,19 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="adfs.cpp" />
+    <ClCompile Include="..\..\..\adfs\adfs.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="adfs.rc" />
+    <ResourceCompile Include="..\..\..\adfs\adfs.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\adfs\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\adfs\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\shibsp\shibsp.vcxproj">
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp.vcxproj">
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f6}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/apache/mod_shib13.vcxproj b/Projects/VC10/apache/mod_shib13.vcxproj
similarity index 84%
rename from apache/mod_shib13.vcxproj
rename to Projects/VC10/apache/mod_shib13.vcxproj
index c5fcfb9..2f27c77 100644
--- a/apache/mod_shib13.vcxproj
+++ b/Projects/VC10/apache/mod_shib13.vcxproj
@@ -61,17 +61,19 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -104,7 +106,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..;$(Apache13Root)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(Apache13Root)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;EAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -117,7 +119,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3.lib;ApacheCore.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache13Root)\libexec;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache13Root)\libexec;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -136,7 +138,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;EAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -149,7 +151,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3.lib;ApacheCore.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -167,7 +169,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;$(Apache13Root)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(Apache13Root)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINDOWS;EAPI;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -181,7 +183,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3D.lib;ApacheCore.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache13Root)\libexec;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache13Root)\libexec;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -199,7 +201,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINDOWS;EAPI;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -213,32 +215,32 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3D.lib;ApacheCore.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\apache\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="mod_shib.cpp">
+    <ClCompile Include="..\..\..\apache\mod_shib.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="mod_shib_13.cpp" />
+    <ClCompile Include="..\..\..\apache\mod_shib_13.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="mod_shib_13.rc" />
+    <ResourceCompile Include="..\..\..\apache\mod_shib_13.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\apache\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp-lite.vcxproj">
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f7}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/apache/mod_shib20.vcxproj b/Projects/VC10/apache/mod_shib20.vcxproj
similarity index 84%
rename from apache/mod_shib20.vcxproj
rename to Projects/VC10/apache/mod_shib20.vcxproj
index 5c0f793..0271950 100644
--- a/apache/mod_shib20.vcxproj
+++ b/Projects/VC10/apache/mod_shib20.vcxproj
@@ -61,19 +61,21 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -106,7 +108,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..;$(Apache20Root)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(Apache20Root)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -120,7 +122,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3.lib;libapr.lib;libaprutil.lib;libhttpd.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache20Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache20Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -139,7 +141,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -153,7 +155,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3.lib;libapr.lib;libaprutil.lib;libhttpd.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -171,7 +173,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;$(Apache20Root)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(Apache20Root)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINDOWS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -186,7 +188,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3D.lib;libapr.lib;libaprutil.lib;libhttpd.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache20Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache20Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -204,7 +206,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINDOWS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -219,32 +221,32 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3D.lib;libapr.lib;libaprutil.lib;libhttpd.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\apache\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="mod_shib.cpp">
+    <ClCompile Include="..\..\..\apache\mod_shib.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="mod_shib_20.cpp" />
+    <ClCompile Include="..\..\..\apache\mod_shib_20.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="mod_shib_20.rc" />
+    <ResourceCompile Include="..\..\..\apache\mod_shib_20.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\apache\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp-lite.vcxproj">
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f7}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/apache/mod_shib22.vcxproj b/Projects/VC10/apache/mod_shib22.vcxproj
similarity index 84%
rename from apache/mod_shib22.vcxproj
rename to Projects/VC10/apache/mod_shib22.vcxproj
index e5a680b..8ad6165 100644
--- a/apache/mod_shib22.vcxproj
+++ b/Projects/VC10/apache/mod_shib22.vcxproj
@@ -61,19 +61,21 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -106,7 +108,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..;$(Apache22Root)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(Apache22Root)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -119,7 +121,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache22Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache22Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -141,7 +143,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..;$(Apache22Root64)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(Apache22Root64)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -154,7 +156,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache22Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache22Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -175,7 +177,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;$(Apache22Root)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(Apache22Root)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -189,7 +191,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache22Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache22Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -210,7 +212,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;$(Apache22Root64)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(Apache22Root64)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -224,7 +226,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache22Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache22Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -234,25 +236,25 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\apache\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="mod_shib.cpp">
+    <ClCompile Include="..\..\..\apache\mod_shib.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="mod_shib_22.cpp" />
+    <ClCompile Include="..\..\..\apache\mod_shib_22.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="mod_shib_22.rc" />
+    <ResourceCompile Include="..\..\..\apache\mod_shib_22.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\apache\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp-lite.vcxproj">
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f7}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/apache/mod_shib24.vcxproj b/Projects/VC10/apache/mod_shib24.vcxproj
similarity index 82%
rename from apache/mod_shib24.vcxproj
rename to Projects/VC10/apache/mod_shib24.vcxproj
index d3510e3..dc15a15 100644
--- a/apache/mod_shib24.vcxproj
+++ b/Projects/VC10/apache/mod_shib24.vcxproj
@@ -61,19 +61,21 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -97,7 +99,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..;$(Apache24Root)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(Apache24Root)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -110,7 +112,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache24Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache24Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -123,7 +125,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..;$(Apache24Root64)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(Apache24Root64)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -136,7 +138,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache24Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache24Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -148,7 +150,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;$(Apache24Root)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(Apache24Root)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -162,7 +164,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache24Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache24Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -174,7 +176,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;$(Apache24Root64)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(Apache24Root64)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -188,7 +190,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache24Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache24Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -198,25 +200,25 @@
     </Bscmake>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\apache\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="mod_shib.cpp">
+    <ClCompile Include="..\..\..\apache\mod_shib.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="mod_shib_24.cpp" />
+    <ClCompile Include="..\..\..\apache\mod_shib_24.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="mod_shib_24.rc" />
+    <ResourceCompile Include="..\..\..\apache\mod_shib_24.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\apache\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp-lite.vcxproj">
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f7}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/fastcgi/shibauthorizer.vcxproj b/Projects/VC10/fastcgi/shibauthorizer.vcxproj
similarity index 84%
rename from fastcgi/shibauthorizer.vcxproj
rename to Projects/VC10/fastcgi/shibauthorizer.vcxproj
index d66b2f7..93b6d32 100644
--- a/fastcgi/shibauthorizer.vcxproj
+++ b/Projects/VC10/fastcgi/shibauthorizer.vcxproj
@@ -60,19 +60,22 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -96,7 +99,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\fastcgi\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -108,7 +111,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3.lib;xmltooling1.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -124,7 +127,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\fastcgi\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -136,7 +139,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3.lib;xmltooling1.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -150,7 +153,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\fastcgi\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -164,7 +167,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
@@ -179,7 +182,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\fastcgi\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -193,7 +196,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
@@ -201,10 +204,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\fastcgi\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="shibauthorizer.cpp">
+    <ClCompile Include="..\..\..\fastcgi\shibauthorizer.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -216,7 +219,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="shibauthorizer.rc" />
+    <ResourceCompile Include="..\..\..\fastcgi\shibauthorizer.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">
diff --git a/fastcgi/shibresponder.vcxproj b/Projects/VC10/fastcgi/shibresponder.vcxproj
similarity index 84%
rename from fastcgi/shibresponder.vcxproj
rename to Projects/VC10/fastcgi/shibresponder.vcxproj
index 9bb4ef0..6d267f3 100644
--- a/fastcgi/shibresponder.vcxproj
+++ b/Projects/VC10/fastcgi/shibresponder.vcxproj
@@ -61,19 +61,22 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -97,7 +100,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\fastcgi\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -109,7 +112,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3.lib;xmltooling1.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -125,7 +128,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\fastcgi\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -137,7 +140,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3.lib;xmltooling1.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -151,7 +154,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\fastcgi\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -165,7 +168,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
@@ -180,7 +183,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\fastcgi\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -194,7 +197,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
@@ -202,10 +205,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\fastcgi\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="shibresponder.cpp">
+    <ClCompile Include="..\..\..\fastcgi\shibresponder.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -217,7 +220,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="shibresponder.rc" />
+    <ResourceCompile Include="..\..\..\fastcgi\shibresponder.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">
diff --git a/isapi_shib/isapi_shib.vcxproj b/Projects/VC10/isapi_shib/isapi_shib.vcxproj
similarity index 85%
rename from isapi_shib/isapi_shib.vcxproj
rename to Projects/VC10/isapi_shib/isapi_shib.vcxproj
index 27ffe44..a26641a 100644
--- a/isapi_shib/isapi_shib.vcxproj
+++ b/Projects/VC10/isapi_shib/isapi_shib.vcxproj
@@ -58,17 +58,20 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -97,7 +100,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\isapi_shib\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -111,7 +114,7 @@
     <Link>
       <AdditionalOptions>/export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -131,7 +134,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\isapi_shib\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -145,7 +148,7 @@
     <Link>
       <AdditionalOptions>/export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -164,7 +167,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\isapi_shib\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINDOWS;WIN32;_DEBUG;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -178,7 +181,7 @@
     <Link>
       <AdditionalOptions>/export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -197,7 +200,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\isapi_shib\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINDOWS;WIN32;_DEBUG;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -211,7 +214,7 @@
     <Link>
       <AdditionalOptions>/export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc %(AdditionalOptions)</AdditionalOptions>
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -219,16 +222,16 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="isapi_shib.cpp" />
+    <ClCompile Include="..\..\..\Isapi_Shib\isapi_shib.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="isapi_shib.rc" />
+    <ResourceCompile Include="..\..\..\Isapi_Shib\isapi_shib.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\Isapi_Shib\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp-lite.vcxproj">
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f7}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/memcache-store/memcache-store.vcxproj b/Projects/VC10/memcache-store/memcache-store.vcxproj
similarity index 80%
rename from memcache-store/memcache-store.vcxproj
rename to Projects/VC10/memcache-store/memcache-store.vcxproj
index c6b50c4..7c1fd30 100644
--- a/memcache-store/memcache-store.vcxproj
+++ b/Projects/VC10/memcache-store/memcache-store.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -58,17 +58,20 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -91,7 +94,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;$(BuildRoot)\libmemcached;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;..\..\..\..\cpp-xmltooling;$(BuildRoot)\libmemcached;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -103,7 +106,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling1D.lib;memcached.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);$(BuildRoot)\libmemcached\visualc\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\$(Configuration);$(BuildRoot)\libmemcached\visualc\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <DataExecutionPrevention>
@@ -116,7 +119,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\cpp-xmltooling;..\..\..\libmemcached\visualc\toolset;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\cpp-xmltooling;..\..\..\libmemcached\visualc\toolset;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -128,7 +131,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <DataExecutionPrevention>
@@ -137,13 +140,13 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;$(BuildRoot)\libmemcached;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;..\..\..\..\cpp-xmltooling;$(BuildRoot)\libmemcached;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling1.lib;memcached.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);$(BuildRoot)\libmemcached\visualc\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\$(Configuration);$(BuildRoot)\libmemcached\visualc\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -157,13 +160,13 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\cpp-xmltooling;..\..\..\libmemcached\visualc\toolset;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\cpp-xmltooling;..\..\..\libmemcached\visualc\toolset;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -173,19 +176,19 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\memcache-store\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="memcache-store.cpp" />
+    <ClCompile Include="..\..\..\memcache-store\memcache-store.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="memcache-store.rc" />
+    <ResourceCompile Include="..\..\..\memcache-store\memcache-store.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\memcache-store\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\shibsp\shibsp.vcxproj">
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp.vcxproj">
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f6}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/nsapi_shib/nsapi_shib.vcxproj b/Projects/VC10/nsapi_shib/nsapi_shib.vcxproj
similarity index 83%
rename from nsapi_shib/nsapi_shib.vcxproj
rename to Projects/VC10/nsapi_shib/nsapi_shib.vcxproj
index ab11054..e182ae0 100644
--- a/nsapi_shib/nsapi_shib.vcxproj
+++ b/Projects/VC10/nsapi_shib/nsapi_shib.vcxproj
@@ -60,17 +60,20 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -99,7 +102,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\nsapi_shib\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -112,7 +115,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;ns-httpd30.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -131,7 +134,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\nsapi_shib\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -144,7 +147,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;ns-httpd30.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -162,7 +165,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\nsapi_shib\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINDOWS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -176,7 +179,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;ns-httpd30.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -194,7 +197,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\nsapi_shib\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_WINDOWS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -208,26 +211,26 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;ns-httpd30.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\nsapi_shib\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="nsapi_shib.cpp" />
+    <ClCompile Include="..\..\..\nsapi_shib\nsapi_shib.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="nsapi_shib.rc" />
+    <ResourceCompile Include="..\..\..\nsapi_shib\nsapi_shib.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\nsapi_shib\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp-lite.vcxproj">
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f7}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/odbc-store/odbc-store.vcxproj b/Projects/VC10/odbc-store/odbc-store.vcxproj
similarity index 82%
rename from odbc-store/odbc-store.vcxproj
rename to Projects/VC10/odbc-store/odbc-store.vcxproj
index fe6b684..9c54825 100644
--- a/odbc-store/odbc-store.vcxproj
+++ b/Projects/VC10/odbc-store/odbc-store.vcxproj
@@ -58,17 +58,21 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -91,7 +95,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -103,7 +107,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <DataExecutionPrevention>
@@ -116,7 +120,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -128,7 +132,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <DataExecutionPrevention>
@@ -137,13 +141,13 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -157,13 +161,13 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -173,16 +177,16 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\odbc-store\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="odbc-store.cpp" />
+    <ClCompile Include="..\..\..\odbc-store\odbc-store.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="odbc-store.rc" />
+    <ResourceCompile Include="..\..\..\odbc-store\odbc-store.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\odbc-store\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/plugins/plugins-lite.vcxproj b/Projects/VC10/plugins/plugins-lite.vcxproj
similarity index 82%
rename from plugins/plugins-lite.vcxproj
rename to Projects/VC10/plugins/plugins-lite.vcxproj
index a4b7303..dece135 100644
--- a/plugins/plugins-lite.vcxproj
+++ b/Projects/VC10/plugins/plugins-lite.vcxproj
@@ -60,17 +60,20 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -99,14 +102,14 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\plugins\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BrowseInformation>true</BrowseInformation>
       <MinimalRebuild>false</MinimalRebuild>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -116,7 +119,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\plugins\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -130,7 +133,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <DataExecutionPrevention>
@@ -146,14 +149,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\plugins\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -162,7 +165,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\plugins\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -170,7 +173,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -180,18 +183,18 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="plugins.cpp" />
-    <ClCompile Include="TimeAccessControl.cpp" />
+    <ClCompile Include="..\..\..\plugins\plugins.cpp" />
+    <ClCompile Include="..\..\..\plugins\TimeAccessControl.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="internal.h" />
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\plugins\internal.h" />
+    <ClInclude Include="..\..\..\plugins\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\plugins\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="plugins.rc" />
+    <ResourceCompile Include="..\..\..\plugins\plugins.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">
diff --git a/plugins/plugins.vcxproj b/Projects/VC10/plugins/plugins.vcxproj
similarity index 77%
rename from plugins/plugins.vcxproj
rename to Projects/VC10/plugins/plugins.vcxproj
index 2a123af..80d23e1 100644
--- a/plugins/plugins.vcxproj
+++ b/Projects/VC10/plugins/plugins.vcxproj
@@ -60,17 +60,20 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -97,14 +100,14 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\plugins\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BrowseInformation>true</BrowseInformation>
       <MinimalRebuild>false</MinimalRebuild>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;saml2D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -114,7 +117,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\plugins\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PrecompiledHeader>
@@ -128,7 +131,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;saml2D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <DataExecutionPrevention>
@@ -144,14 +147,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\plugins\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;saml2.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
@@ -160,7 +163,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\plugins\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -168,7 +171,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;saml2.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -178,22 +181,22 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="CaseFoldingAttributeResolver.cpp" />
-    <ClCompile Include="GSSAPIAttributeExtractor.cpp" />
-    <ClCompile Include="plugins.cpp" />
-    <ClCompile Include="TemplateAttributeResolver.cpp" />
-    <ClCompile Include="TimeAccessControl.cpp" />
-    <ClCompile Include="TransformAttributeResolver.cpp" />
+    <ClCompile Include="..\..\..\plugins\CaseFoldingAttributeResolver.cpp" />
+    <ClCompile Include="..\..\..\plugins\GSSAPIAttributeExtractor.cpp" />
+    <ClCompile Include="..\..\..\plugins\plugins.cpp" />
+    <ClCompile Include="..\..\..\plugins\TemplateAttributeResolver.cpp" />
+    <ClCompile Include="..\..\..\plugins\TimeAccessControl.cpp" />
+    <ClCompile Include="..\..\..\plugins\TransformAttributeResolver.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="internal.h" />
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\plugins\internal.h" />
+    <ClInclude Include="..\..\..\plugins\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\plugins\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="plugins.rc" />
+    <ResourceCompile Include="..\..\..\plugins\plugins.rc" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\shibsp\shibsp.vcxproj">
diff --git a/plugins/plugins.vcxproj.filters b/Projects/VC10/plugins/plugins.vcxproj.filters
similarity index 100%
rename from plugins/plugins.vcxproj.filters
rename to Projects/VC10/plugins/plugins.vcxproj.filters
diff --git a/shibd/shibd.vcxproj b/Projects/VC10/shibd/shibd.vcxproj
similarity index 79%
rename from shibd/shibd.vcxproj
rename to Projects/VC10/shibd/shibd.vcxproj
index 4fe5c20..9b1b0fe 100644
--- a/shibd/shibd.vcxproj
+++ b/Projects/VC10/shibd/shibd.vcxproj
@@ -57,17 +57,19 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -91,7 +93,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\shibd\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -104,7 +106,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;log4shib1.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -120,7 +122,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\shibd\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -133,7 +135,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;log4shib1.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -147,7 +149,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\shibd\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -161,7 +163,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;log4shib1D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
@@ -176,7 +178,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\shibd\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -190,7 +192,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>wsock32.lib;log4shib1D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
@@ -198,20 +200,20 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
+    <None Include="..\..\..\shibd\Makefile.am" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\shibd\resource.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="shibd.cpp" />
-    <ClCompile Include="shibd_win32.cpp" />
+    <ClCompile Include="..\..\..\shibd\shibd.cpp" />
+    <ClCompile Include="..\..\..\shibd\shibd_win32.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="shibd.rc" />
+    <ResourceCompile Include="..\..\..\shibd\shibd.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\shibsp\shibsp.vcxproj">
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp.vcxproj">
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f6}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
diff --git a/shibsp/shibsp-lite.vcxproj b/Projects/VC10/shibsp/shibsp-lite.vcxproj
similarity index 53%
rename from shibsp/shibsp-lite.vcxproj
rename to Projects/VC10/shibsp/shibsp-lite.vcxproj
index f3facff..890746c 100644
--- a/shibsp/shibsp-lite.vcxproj
+++ b/Projects/VC10/shibsp/shibsp-lite.vcxproj
@@ -58,19 +58,22 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -93,7 +96,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\shibsp;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -105,7 +108,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <DataExecutionPrevention>
@@ -119,7 +122,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\shibsp;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <BrowseInformation>true</BrowseInformation>
@@ -131,7 +134,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <DataExecutionPrevention>
@@ -141,7 +144,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\shibsp;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WANT_TCP_SHAR;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
@@ -150,7 +153,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -165,7 +168,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\shibsp\;..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WANT_TCP_SHAR;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
@@ -174,7 +177,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -185,118 +188,118 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="AbstractSPRequest.cpp" />
-    <ClCompile Include="Application.cpp" />
-    <ClCompile Include="binding\impl\XMLProtocolProvider.cpp" />
-    <ClCompile Include="handler\impl\AttributeCheckerHandler.cpp" />
-    <ClCompile Include="handler\impl\DiscoveryFeed.cpp" />
-    <ClCompile Include="handler\impl\ExternalAuthHandler.cpp" />
-    <ClCompile Include="handler\impl\LogoutInitiator.cpp" />
-    <ClCompile Include="handler\impl\SecuredHandler.cpp" />
-    <ClCompile Include="ServiceProvider.cpp" />
-    <ClCompile Include="SPConfig.cpp" />
-    <ClCompile Include="util\CGIParser.cpp" />
-    <ClCompile Include="util\DOMPropertySet.cpp" />
-    <ClCompile Include="util\IPRange.cpp" />
-    <ClCompile Include="util\SPConstants.cpp" />
-    <ClCompile Include="util\TemplateParameters.cpp" />
-    <ClCompile Include="remoting\impl\ddf.cpp" />
-    <ClCompile Include="remoting\impl\ListenerService.cpp" />
-    <ClCompile Include="remoting\impl\SocketListener.cpp" />
-    <ClCompile Include="remoting\impl\TCPListener.cpp" />
-    <ClCompile Include="impl\ChainingAccessControl.cpp" />
-    <ClCompile Include="impl\StorageServiceSessionCache.cpp" />
-    <ClCompile Include="impl\XMLAccessControl.cpp" />
-    <ClCompile Include="impl\XMLRequestMapper.cpp" />
-    <ClCompile Include="impl\XMLServiceProvider.cpp" />
-    <ClCompile Include="attribute\Attribute.cpp" />
-    <ClCompile Include="attribute\BinaryAttribute.cpp" />
-    <ClCompile Include="attribute\ExtensibleAttribute.cpp" />
-    <ClCompile Include="attribute\NameIDAttribute.cpp" />
-    <ClCompile Include="attribute\ScopedAttribute.cpp" />
-    <ClCompile Include="attribute\SimpleAttribute.cpp" />
-    <ClCompile Include="attribute\XMLAttribute.cpp" />
-    <ClCompile Include="handler\impl\AbstractHandler.cpp" />
-    <ClCompile Include="handler\impl\AssertionConsumerService.cpp" />
-    <ClCompile Include="handler\impl\AssertionLookup.cpp" />
-    <ClCompile Include="handler\impl\ChainingLogoutInitiator.cpp" />
-    <ClCompile Include="handler\impl\ChainingSessionInitiator.cpp" />
-    <ClCompile Include="handler\impl\CookieSessionInitiator.cpp" />
-    <ClCompile Include="handler\impl\FormSessionInitiator.cpp" />
-    <ClCompile Include="handler\impl\LocalLogoutInitiator.cpp" />
-    <ClCompile Include="handler\impl\LogoutHandler.cpp" />
-    <ClCompile Include="handler\impl\MetadataGenerator.cpp" />
-    <ClCompile Include="handler\impl\RemotedHandler.cpp" />
-    <ClCompile Include="handler\impl\SAML1Consumer.cpp" />
-    <ClCompile Include="handler\impl\SAML2ArtifactResolution.cpp" />
-    <ClCompile Include="handler\impl\SAML2Consumer.cpp" />
-    <ClCompile Include="handler\impl\SAML2Logout.cpp" />
-    <ClCompile Include="handler\impl\SAML2LogoutInitiator.cpp" />
-    <ClCompile Include="handler\impl\SAML2NameIDMgmt.cpp" />
-    <ClCompile Include="handler\impl\SAML2SessionInitiator.cpp" />
-    <ClCompile Include="handler\impl\SAMLDSSessionInitiator.cpp" />
-    <ClCompile Include="handler\impl\SessionHandler.cpp" />
-    <ClCompile Include="handler\impl\SessionInitiator.cpp" />
-    <ClCompile Include="handler\impl\Shib1SessionInitiator.cpp" />
-    <ClCompile Include="handler\impl\StatusHandler.cpp" />
-    <ClCompile Include="handler\impl\TransformSessionInitiator.cpp" />
-    <ClCompile Include="handler\impl\WAYFSessionInitiator.cpp" />
-    <ClCompile Include="lite\CommonDomainCookie.cpp" />
-    <ClCompile Include="lite\SAMLConstants.cpp" />
-    <ClCompile Include="version.cpp" />
+    <ClCompile Include="..\..\..\shibsp\AbstractSPRequest.cpp" />
+    <ClCompile Include="..\..\..\shibsp\Application.cpp" />
+    <ClCompile Include="..\..\..\shibsp\binding\impl\XMLProtocolProvider.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AttributeCheckerHandler.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\DiscoveryFeed.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ExternalAuthHandler.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SecuredHandler.cpp" />
+    <ClCompile Include="..\..\..\shibsp\ServiceProvider.cpp" />
+    <ClCompile Include="..\..\..\shibsp\SPConfig.cpp" />
+    <ClCompile Include="..\..\..\shibsp\util\CGIParser.cpp" />
+    <ClCompile Include="..\..\..\shibsp\util\DOMPropertySet.cpp" />
+    <ClCompile Include="..\..\..\shibsp\util\IPRange.cpp" />
+    <ClCompile Include="..\..\..\shibsp\util\SPConstants.cpp" />
+    <ClCompile Include="..\..\..\shibsp\util\TemplateParameters.cpp" />
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ddf.cpp" />
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ListenerService.cpp" />
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\SocketListener.cpp" />
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\TCPListener.cpp" />
+    <ClCompile Include="..\..\..\shibsp\impl\ChainingAccessControl.cpp" />
+    <ClCompile Include="..\..\..\shibsp\impl\StorageServiceSessionCache.cpp" />
+    <ClCompile Include="..\..\..\shibsp\impl\XMLAccessControl.cpp" />
+    <ClCompile Include="..\..\..\shibsp\impl\XMLRequestMapper.cpp" />
+    <ClCompile Include="..\..\..\shibsp\impl\XMLServiceProvider.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\Attribute.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\BinaryAttribute.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\ExtensibleAttribute.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttribute.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttribute.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\SimpleAttribute.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\XMLAttribute.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AbstractHandler.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionConsumerService.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionLookup.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingLogoutInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingSessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\CookieSessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\FormSessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LocalLogoutInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutHandler.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\MetadataGenerator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\RemotedHandler.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML1Consumer.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2ArtifactResolution.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Consumer.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Logout.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2LogoutInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2NameIDMgmt.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2SessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAMLDSSessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionHandler.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\Shib1SessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\StatusHandler.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\TransformSessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\WAYFSessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\lite\CommonDomainCookie.cpp" />
+    <ClCompile Include="..\..\..\shibsp\lite\SAMLConstants.cpp" />
+    <ClCompile Include="..\..\..\shibsp\version.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="binding\ProtocolProvider.h" />
-    <ClInclude Include="GSSRequest.h" />
-    <ClInclude Include="handler\LogoutInitiator.h" />
-    <ClInclude Include="handler\SecuredHandler.h" />
-    <ClInclude Include="remoting\impl\SocketListener.h" />
-    <ClInclude Include="AbstractSPRequest.h" />
-    <ClInclude Include="AccessControl.h" />
-    <ClInclude Include="Application.h" />
-    <ClInclude Include="base.h" />
-    <ClInclude Include="config_pub_win32.h" />
-    <ClInclude Include="exceptions.h" />
-    <ClInclude Include="internal.h" />
-    <ClInclude Include="RequestMapper.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="ServiceProvider.h" />
-    <ClInclude Include="SessionCache.h" />
-    <ClInclude Include="SessionCacheEx.h" />
-    <ClInclude Include="SPConfig.h" />
-    <ClInclude Include="SPRequest.h" />
-    <ClInclude Include="version.h" />
-    <ClInclude Include="util\CGIParser.h" />
-    <ClInclude Include="util\DOMPropertySet.h" />
-    <ClInclude Include="util\IPRange.h" />
-    <ClInclude Include="util\PropertySet.h" />
-    <ClInclude Include="util\SPConstants.h" />
-    <ClInclude Include="util\TemplateParameters.h" />
-    <ClInclude Include="remoting\ddf.h" />
-    <ClInclude Include="remoting\ListenerService.h" />
-    <ClInclude Include="attribute\Attribute.h" />
-    <ClInclude Include="attribute\BinaryAttribute.h" />
-    <ClInclude Include="attribute\ExtensibleAttribute.h" />
-    <ClInclude Include="attribute\NameIDAttribute.h" />
-    <ClInclude Include="attribute\ScopedAttribute.h" />
-    <ClInclude Include="attribute\SimpleAttribute.h" />
-    <ClInclude Include="attribute\XMLAttribute.h" />
-    <ClInclude Include="handler\AbstractHandler.h" />
-    <ClInclude Include="handler\AssertionConsumerService.h" />
-    <ClInclude Include="handler\Handler.h" />
-    <ClInclude Include="handler\LogoutHandler.h" />
-    <ClInclude Include="handler\RemotedHandler.h" />
-    <ClInclude Include="handler\SessionInitiator.h" />
-    <ClInclude Include="lite\CommonDomainCookie.h" />
-    <ClInclude Include="lite\SAMLConstants.h" />
+    <ClInclude Include="..\..\..\shibsp\binding\ProtocolProvider.h" />
+    <ClInclude Include="..\..\..\shibsp\GSSRequest.h" />
+    <ClInclude Include="..\..\..\shibsp\handler\LogoutInitiator.h" />
+    <ClInclude Include="..\..\..\shibsp\handler\SecuredHandler.h" />
+    <ClInclude Include="..\..\..\shibsp\remoting\impl\SocketListener.h" />
+    <ClInclude Include="..\..\..\shibsp\AbstractSPRequest.h" />
+    <ClInclude Include="..\..\..\shibsp\AccessControl.h" />
+    <ClInclude Include="..\..\..\shibsp\Application.h" />
+    <ClInclude Include="..\..\..\shibsp\base.h" />
+    <ClInclude Include="..\..\..\shibsp\config_pub_win32.h" />
+    <ClInclude Include="..\..\..\shibsp\exceptions.h" />
+    <ClInclude Include="..\..\..\shibsp\internal.h" />
+    <ClInclude Include="..\..\..\shibsp\RequestMapper.h" />
+    <ClInclude Include="..\..\..\shibsp\resource.h" />
+    <ClInclude Include="..\..\..\shibsp\ServiceProvider.h" />
+    <ClInclude Include="..\..\..\shibsp\SessionCache.h" />
+    <ClInclude Include="..\..\..\shibsp\SessionCacheEx.h" />
+    <ClInclude Include="..\..\..\shibsp\SPConfig.h" />
+    <ClInclude Include="..\..\..\shibsp\SPRequest.h" />
+    <ClInclude Include="..\..\..\shibsp\version.h" />
+    <ClInclude Include="..\..\..\shibsp\util\CGIParser.h" />
+    <ClInclude Include="..\..\..\shibsp\util\DOMPropertySet.h" />
+    <ClInclude Include="..\..\..\shibsp\util\IPRange.h" />
+    <ClInclude Include="..\..\..\shibsp\util\PropertySet.h" />
+    <ClInclude Include="..\..\..\shibsp\util\SPConstants.h" />
+    <ClInclude Include="..\..\..\shibsp\util\TemplateParameters.h" />
+    <ClInclude Include="..\..\..\shibsp\remoting\ddf.h" />
+    <ClInclude Include="..\..\..\shibsp\remoting\ListenerService.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\Attribute.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\BinaryAttribute.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\ExtensibleAttribute.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\NameIDAttribute.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\ScopedAttribute.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\SimpleAttribute.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\XMLAttribute.h" />
+    <ClInclude Include="..\..\..\shibsp\handler\AbstractHandler.h" />
+    <ClInclude Include="..\..\..\shibsp\handler\AssertionConsumerService.h" />
+    <ClInclude Include="..\..\..\shibsp\handler\Handler.h" />
+    <ClInclude Include="..\..\..\shibsp\handler\LogoutHandler.h" />
+    <ClInclude Include="..\..\..\shibsp\handler\RemotedHandler.h" />
+    <ClInclude Include="..\..\..\shibsp\handler\SessionInitiator.h" />
+    <ClInclude Include="..\..\..\shibsp\lite\CommonDomainCookie.h" />
+    <ClInclude Include="..\..\..\shibsp\lite\SAMLConstants.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="shibsp.rc" />
+    <ResourceCompile Include="..\..\..\shibsp\shibsp.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Makefile.am" />
-    <None Include="paths.h.in" />
-    <None Include="config_pub.h.in" />
+    <None Include="..\..\..\shibsp\Makefile.am" />
+    <None Include="..\..\..\shibsp\paths.h.in" />
+    <None Include="..\..\..\shibsp\config_pub.h.in" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/shibsp/shibsp-lite.vcxproj.filters b/Projects/VC10/shibsp/shibsp-lite.vcxproj.filters
similarity index 100%
rename from shibsp/shibsp-lite.vcxproj.filters
rename to Projects/VC10/shibsp/shibsp-lite.vcxproj.filters
diff --git a/Projects/VC10/shibsp/shibsp.vcxproj b/Projects/VC10/shibsp/shibsp.vcxproj
new file mode 100644
index 0000000..8755d1d
--- /dev/null
+++ b/Projects/VC10/shibsp/shibsp.vcxproj
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{81F0F7A6-DC36-46EF-957F-F9E81D4403F6}</ProjectGuid>
+    <RootNamespace>shibsp</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <Import Project="..\..\..\..\BuildPath.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <Import Project="$(ParentRoot)\Includes.props" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)1_5D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_5D</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_5</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_5</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\shibsp\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xsec_1D.lib;saml2D.lib;xmltooling1D.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(TargetDir)$(ProjectName)1D.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\..\shibsp\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xsec_1D.lib;saml2D.lib;xmltooling1D.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(TargetDir)$(ProjectName)1D.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\shibsp;..\..\..;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xsec_1.lib;saml2.lib;xmltooling1.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(TargetDir)$(ProjectName)1.lib</ImportLibrary>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <AdditionalIncludeDirectories>..\..\..\shibsp\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xsec_1.lib;saml2.lib;xmltooling1.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <ImportLibrary>$(TargetDir)$(ProjectName)1.lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\shibsp\AbstractSPRequest.cpp" />
+    <ClCompile Include="..\..\..\shibsp\Application.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\Base64AttributeDecoder.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerEntityAttributeFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerEntityMatcherFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterEntityAttributeFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterEntityMatcherFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\DummyAttributeFilter.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NameIDQualifierStringFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\AssertionAttributeExtractor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\MetadataAttributeExtractor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\binding\impl\XMLProtocolProvider.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AttributeCheckerHandler.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\DiscoveryFeed.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ExternalAuthHandler.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SecuredHandler.cpp" />
+    <ClCompile Include="..\..\..\shibsp\impl\XMLSecurityPolicyProvider.cpp" />
+    <ClCompile Include="..\..\..\shibsp\ServiceProvider.cpp" />
+    <ClCompile Include="..\..\..\shibsp\SPConfig.cpp" />
+    <ClCompile Include="..\..\..\shibsp\util\CGIParser.cpp" />
+    <ClCompile Include="..\..\..\shibsp\util\DOMPropertySet.cpp" />
+    <ClCompile Include="..\..\..\shibsp\util\IPRange.cpp" />
+    <ClCompile Include="..\..\..\shibsp\util\SPConstants.cpp" />
+    <ClCompile Include="..\..\..\shibsp\util\TemplateParameters.cpp" />
+    <ClCompile Include="..\..\..\shibsp\security\PKIXTrustEngine.cpp" />
+    <ClCompile Include="..\..\..\shibsp\security\SecurityPolicy.cpp" />
+    <ClCompile Include="..\..\..\shibsp\metadata\DynamicMetadataProvider.cpp" />
+    <ClCompile Include="..\..\..\shibsp\metadata\MetadataExtImpl.cpp" />
+    <ClCompile Include="..\..\..\shibsp\metadata\MetadataExtSchemaValidators.cpp" />
+    <ClCompile Include="..\..\..\shibsp\metadata\MetadataProviderCriteria.cpp" />
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ddf.cpp" />
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ListenerService.cpp" />
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\SocketListener.cpp" />
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\TCPListener.cpp" />
+    <ClCompile Include="..\..\..\shibsp\impl\ChainingAccessControl.cpp" />
+    <ClCompile Include="..\..\..\shibsp\impl\StorageServiceSessionCache.cpp" />
+    <ClCompile Include="..\..\..\shibsp\impl\TransactionLog.cpp" />
+    <ClCompile Include="..\..\..\shibsp\impl\XMLAccessControl.cpp" />
+    <ClCompile Include="..\..\..\shibsp\impl\XMLRequestMapper.cpp" />
+    <ClCompile Include="..\..\..\shibsp\impl\XMLServiceProvider.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\Attribute.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\BinaryAttribute.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\DOMAttributeDecoder.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\ExtensibleAttribute.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\KeyInfoAttributeDecoder.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttribute.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttributeDecoder.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDFromScopedAttributeDecoder.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttribute.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttributeDecoder.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\SimpleAttribute.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\StringAttributeDecoder.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\XMLAttribute.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\XMLAttributeDecoder.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\ChainingAttributeExtractor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\ChainingAttributeResolver.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\DelegationAttributeExtractor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\KeyDescriptorAttributeExtractor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\QueryAttributeResolver.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\SimpleAggregationAttributeResolver.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\XMLAttributeExtractor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AndMatchFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AnyMatchFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeFilter.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerInEntityGroupFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerRegexFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerStringFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterInEntityGroupFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterRegexFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterStringFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeScopeMatchesShibMDScopeFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeScopeRegexFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeScopeStringFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeValueRegexFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeValueStringFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AuthenticationMethodRegexFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AuthenticationMethodStringFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\BasicFilteringContext.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\ChainingAttributeFilter.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\MatchFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NotMatchFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NumberOfAttributeValuesFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\OrMatchFunctor.cpp" />
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\XMLAttributeFilter.cpp" />
+    <ClCompile Include="..\..\..\shibsp\binding\impl\ArtifactResolver.cpp" />
+    <ClCompile Include="..\..\..\shibsp\binding\impl\SOAPClient.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AbstractHandler.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionConsumerService.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionLookup.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingLogoutInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingSessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\CookieSessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\FormSessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LocalLogoutInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutHandler.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\MetadataGenerator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\RemotedHandler.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML1Consumer.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2ArtifactResolution.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Consumer.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Logout.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2LogoutInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2NameIDMgmt.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2SessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAMLDSSessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionHandler.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\Shib1SessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\StatusHandler.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\TransformSessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\handler\impl\WAYFSessionInitiator.cpp" />
+    <ClCompile Include="..\..\..\shibsp\version.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\shibsp\binding\ProtocolProvider.h" />
+    <ClInclude Include="..\..\..\shibsp\GSSRequest.h" />
+    <ClInclude Include="..\..\..\shibsp\handler\LogoutInitiator.h" />
+    <ClInclude Include="..\..\..\shibsp\handler\SecuredHandler.h" />
+    <ClInclude Include="..\..\..\shibsp\remoting\impl\SocketListener.h" />
+    <ClInclude Include="..\..\..\shibsp\AbstractSPRequest.h" />
+    <ClInclude Include="..\..\..\shibsp\AccessControl.h" />
+    <ClInclude Include="..\..\..\shibsp\Application.h" />
+    <ClInclude Include="..\..\..\shibsp\base.h" />
+    <ClInclude Include="..\..\..\shibsp\config_pub_win32.h" />
+    <ClInclude Include="..\..\..\shibsp\exceptions.h" />
+    <ClInclude Include="..\..\..\shibsp\internal.h" />
+    <ClInclude Include="..\..\..\shibsp\RequestMapper.h" />
+    <ClInclude Include="..\..\..\shibsp\resource.h" />
+    <ClInclude Include="..\..\..\shibsp\security\SecurityPolicyProvider.h" />
+    <ClInclude Include="..\..\..\shibsp\ServiceProvider.h" />
+    <ClInclude Include="..\..\..\shibsp\SessionCache.h" />
+    <ClInclude Include="..\..\..\shibsp\SessionCacheEx.h" />
+    <ClInclude Include="..\..\..\shibsp\SPConfig.h" />
+    <ClInclude Include="..\..\..\shibsp\SPRequest.h" />
+    <ClInclude Include="..\..\..\shibsp\TransactionLog.h" />
+    <ClInclude Include="..\..\..\shibsp\version.h" />
+    <ClInclude Include="..\..\..\shibsp\util\CGIParser.h" />
+    <ClInclude Include="..\..\..\shibsp\util\DOMPropertySet.h" />
+    <ClInclude Include="..\..\..\shibsp\util\IPRange.h" />
+    <ClInclude Include="..\..\..\shibsp\util\PropertySet.h" />
+    <ClInclude Include="..\..\..\shibsp\util\SPConstants.h" />
+    <ClInclude Include="..\..\..\shibsp\util\TemplateParameters.h" />
+    <ClInclude Include="..\..\..\shibsp\security\PKIXTrustEngine.h" />
+    <ClInclude Include="..\..\..\shibsp\security\SecurityPolicy.h" />
+    <ClInclude Include="..\..\..\shibsp\remoting\ddf.h" />
+    <ClInclude Include="..\..\..\shibsp\remoting\ListenerService.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\Attribute.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\BinaryAttribute.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\AttributeDecoder.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\ExtensibleAttribute.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\NameIDAttribute.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\ScopedAttribute.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\SimpleAttribute.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\XMLAttribute.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\resolver\AttributeExtractor.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\resolver\AttributeResolver.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\resolver\ResolutionContext.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\AttributeFilter.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\BasicFilteringContext.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\FilteringContext.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\FilterPolicyContext.h" />
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\MatchFunctor.h" />
+    <ClInclude Include="..\..\..\shibsp\binding\ArtifactResolver.h" />
+    <ClInclude Include="..\..\..\shibsp\binding\SOAPClient.h" />
+    <ClInclude Include="..\..\..\shibsp\handler\AbstractHandler.h" />
+    <ClInclude Include="..\..\..\shibsp\handler\AssertionConsumerService.h" />
+    <ClInclude Include="..\..\..\shibsp\handler\Handler.h" />
+    <ClInclude Include="..\..\..\shibsp\handler\LogoutHandler.h" />
+    <ClInclude Include="..\..\..\shibsp\handler\RemotedHandler.h" />
+    <ClInclude Include="..\..\..\shibsp\handler\SessionInitiator.h" />
+    <ClInclude Include="..\..\..\shibsp\metadata\MetadataExt.h" />
+    <ClInclude Include="..\..\..\shibsp\metadata\MetadataProviderCriteria.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\shibsp\shibsp.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\shibsp\Makefile.am" />
+    <None Include="..\..\..\shibsp\paths.h.in" />
+    <None Include="..\..\..\shibsp\config_pub.h.in" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/shibsp/shibsp.vcxproj.filters b/Projects/VC10/shibsp/shibsp.vcxproj.filters
similarity index 100%
rename from shibsp/shibsp.vcxproj.filters
rename to Projects/VC10/shibsp/shibsp.vcxproj.filters
diff --git a/util/mdquery.vcxproj b/Projects/VC10/util/mdquery.vcxproj
similarity index 81%
rename from util/mdquery.vcxproj
rename to Projects/VC10/util/mdquery.vcxproj
index 2f06754..ebb2a38 100644
--- a/util/mdquery.vcxproj
+++ b/Projects/VC10/util/mdquery.vcxproj
@@ -57,17 +57,20 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -91,7 +94,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\.;..\..\..;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -104,7 +107,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1.lib;saml2.lib;xmltooling1.lib;xerces-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -120,7 +123,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\.;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -133,7 +136,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1.lib;saml2.lib;xmltooling1.lib;xerces-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -147,7 +150,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\.;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -161,7 +164,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1D.lib;saml2D.lib;xmltooling1D.lib;xerces-c_3D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
@@ -176,7 +179,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\.;..\..\..;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -190,7 +193,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1D.lib;saml2D.lib;xmltooling1D.lib;xerces-c_3D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
@@ -198,7 +201,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="mdquery.cpp" />
+    <ClCompile Include="..\..\..\util\mdquery.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\shibsp\shibsp.vcxproj">
@@ -207,10 +210,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="mdquery.rc" />
+    <ResourceCompile Include="..\..\..\util\mdquery.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\util\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/util/resolvertest.vcxproj b/Projects/VC10/util/resolvertest.vcxproj
similarity index 81%
rename from util/resolvertest.vcxproj
rename to Projects/VC10/util/resolvertest.vcxproj
index 19773c9..97f195f 100644
--- a/util/resolvertest.vcxproj
+++ b/Projects/VC10/util/resolvertest.vcxproj
@@ -59,18 +59,21 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
+  <Import Project="..\..\..\..\BuildPath.props" />
   <Import Project="$(ParentRoot)\Versions.props" />
   <Import Project="$(ParentRoot)\Includes.props" />
 
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>
+
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
@@ -94,7 +97,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\util;..\..\..;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -107,7 +110,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1.lib;saml2.lib;xmltooling1.lib;xerces-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -123,7 +126,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\util\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -136,7 +139,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1.lib;saml2.lib;xmltooling1.lib;xerces-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
       </DataExecutionPrevention>
@@ -150,7 +153,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\util\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -164,7 +167,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1D.lib;saml2D.lib;xmltooling1D.lib;xerces-c_3D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
@@ -179,7 +182,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\util;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -193,7 +196,7 @@
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>log4shib1D.lib;saml2D.lib;xmltooling1D.lib;xerces-c_3D.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <DataExecutionPrevention>
@@ -201,7 +204,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="resolvertest.cpp" />
+    <ClCompile Include="..\..\..\util\resolvertest.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\shibsp\shibsp.vcxproj">
@@ -210,10 +213,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resolvertest.rc" />
+    <ResourceCompile Include="..\..\..\util\resolvertest.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="resource.h" />
+    <ClInclude Include="..\..\..\util\resource.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Projects/VC10/wix/MergeModules.vcxproj b/Projects/VC10/wix/MergeModules.vcxproj
new file mode 100644
index 0000000..caf8cfd
--- /dev/null
+++ b/Projects/VC10/wix/MergeModules.vcxproj
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}</ProjectGuid>
+    <Keyword>MakeFileProj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Makefile</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <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" />
+  </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" />
+  </ImportGroup>
+  <Import Project="..\..\..\..\BuildPath.props" />
+  <Import Project="$(ParentRoot)\Versions.props" />
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+    <NMakeBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
+nmake /f MergeModules.make clean</NMakeBuildCommandLine>
+    <NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules
+del *.wixobj</NMakeCleanCommandLine>
+    <NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
+nmake /f MergeModules.make clean</NMakeReBuildCommandLine>
+    <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <NMakeBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLFileVersion=$(OpenSAMLFileVersion) OpenSAMLVersion=$(OpenSAMLVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(X [...]
+    <NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules
+del *86.wixobj
+del *86.msm
+del *x86.wixpdb
+del OpenSAML-schemas.wixpdb
+del OpenSAML-schemas.wixobj
+del OpenSAML-schemas.msm</NMakeCleanCommandLine>
+    <NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion)  Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d)  SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32= [...]
+    <NMakePreprocessorDefinitions>
+    </NMakePreprocessorDefinitions>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <NMakeBuildCommandLine>
+cd ..\..\..\msi\Wix\MergeModules
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$( [...]
+    <NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules
+del *64.wixobj
+del *64.msm 
+del *64.wixpdb 
+del OpenSAML-schemas.wixpdb 
+del OpenSAML-schemas.wixobj
+del OpenSAML-schemas.msm</NMakeCleanCommandLine>
+    <NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(X [...]
+    <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="..\..\..\msi\Wix\MergeModules\Curl-x64.wxs">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="..\..\..\msi\Wix\MergeModules\Curl-x86.wxs" />
+    <None Include="..\..\..\msi\Wix\MergeModules\FastCGI-x86.wxs" />
+    <None Include="..\..\..\msi\Wix\MergeModules\FastCGI-x64.wxs" />
+    <None Include="..\..\..\msi\Wix\MergeModules\MergeModules.make" />
+    <None Include="..\..\..\msi\Wix\MergeModules\Log4Shib-x64.wxs" />
+    <None Include="..\..\..\msi\Wix\MergeModules\Log4Shib-x86.wxs" />
+    <None Include="..\..\..\msi\Wix\MergeModules\OpenSAML-schemas.wxs" />
+    <None Include="..\..\..\msi\Wix\MergeModules\OpenSAML-x64.wxs">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="..\..\..\msi\Wix\MergeModules\OpenSAML-x86.wxs">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="..\..\..\msi\Wix\MergeModules\OpenSSL-x64.wxs" />
+    <None Include="..\..\..\msi\Wix\MergeModules\OpenSSL-x86.wxs" />
+    <None Include="..\..\..\msi\Wix\MergeModules\Shibboleth-schemas.wxs" />
+    <None Include="..\..\..\msi\Wix\MergeModules\Shibboleth-x64.wxs" />
+    <None Include="..\..\..\msi\Wix\MergeModules\Shibboleth-x86.wxs" />
+    <None Include="..\..\..\msi\Wix\MergeModules\Xerces-x64.wxs" />
+    <None Include="..\..\..\msi\Wix\MergeModules\Xerces-x86.wxs" />
+    <None Include="..\..\..\msi\Wix\MergeModules\XmlSec-x64.wxs" />
+    <None Include="..\..\..\msi\Wix\MergeModules\XmlSec-x86.wxs" />
+    <None Include="..\..\..\msi\Wix\MergeModules\Zlib-x64.wxs" />
+    <None Include="..\..\..\msi\Wix\MergeModules\Zlib-x86.wxs" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/adfs/.gitignore b/adfs/.gitignore
deleted file mode 100644
index 090baf1..0000000
--- a/adfs/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/*.user
-/adfs-lite-Debug
-/Release
-/Debug
-/adfs-lite-Release
-/x64
-/.deps
-/Makefile.in
-/Makefile
diff --git a/apache/.gitignore b/apache/.gitignore
index e6ea852..1b06ef2 100644
--- a/apache/.gitignore
+++ b/apache/.gitignore
@@ -11,10 +11,4 @@
 /*.mak
 /*.aps
 /*.user
-/mod_shib_20-Debug
-/mod_shib_22-Debug
-/mod_shib_22-Release
-/mod_shib_20-Release
-/x64
-/mod_shib_24-Debug/
-/mod_shib_24-Release/
+
diff --git a/fastcgi/.gitignore b/fastcgi/.gitignore
index 09e3a08..589009b 100644
--- a/fastcgi/.gitignore
+++ b/fastcgi/.gitignore
@@ -1,9 +1,3 @@
-/*.user
-/shibauthorizer-Release
-/shibresponder-Release
-/shibresponder-Debug
-/shibauthorizer-Debug
-/x64
 /.deps
 /Makefile.in
 /Makefile
diff --git a/isapi_shib/.gitignore b/isapi_shib/.gitignore
index eddeb4e..e7009e6 100644
--- a/isapi_shib/.gitignore
+++ b/isapi_shib/.gitignore
@@ -1,7 +1,3 @@
 /*.plg
-/Release
-/Debug
 /*.dep
 /*.mak
-/*.user
-/x64
diff --git a/memcache-store/.gitignore b/memcache-store/.gitignore
index 9d7f3e7..589009b 100644
--- a/memcache-store/.gitignore
+++ b/memcache-store/.gitignore
@@ -1,7 +1,3 @@
-/*.user
-/Debug
-/Release
 /.deps
 /Makefile.in
 /Makefile
-/x64
diff --git a/msi/.gitignore b/msi/.gitignore
index d5e13b4..b9f60fa 100644
--- a/msi/.gitignore
+++ b/msi/.gitignore
@@ -1,2 +1 @@
-/*.msi
 /compile.log
diff --git a/msi/WiX/MergeModules/MergeModules.vcxproj b/msi/WiX/MergeModules/MergeModules.vcxproj
deleted file mode 100644
index 1c2109d..0000000
--- a/msi/WiX/MergeModules/MergeModules.vcxproj
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}</ProjectGuid>
-    <Keyword>MakeFileProj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <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" />
-  </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" />
-  </ImportGroup>
-  <Import Project="..\..\..\..\BuildPath.props" />
-  <Import Project="$(ParentRoot)\Versions.props" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-    <NMakeBuildCommandLine>nmake /f MergeModules.make clean</NMakeBuildCommandLine>
-    <NMakeCleanCommandLine>del *.wixobj</NMakeCleanCommandLine>
-    <NMakeReBuildCommandLine>nmake /f MergeModules.make clean</NMakeReBuildCommandLine>
-    <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) OpenSAMLVersion=$(OpenSAMLVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLT [...]
-    <NMakeCleanCommandLine>del *86.wixobj
-del *86.msm
-del *x86.wixpdb
-del OpenSAML-schemas.wixpdb
-del OpenSAML-schemas.wixobj
-del OpenSAML-schemas.msm</NMakeCleanCommandLine>
-    <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion)  Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d)  SolutionDir=$(SolutionDir) OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) [...]
-    <NMakePreprocessorDefinitions>
-    </NMakePreprocessorDefinitions>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XML [...]
-    <NMakeCleanCommandLine>del *64.wixobj
-del *64.msm 
-del *64.wixpdb 
-del OpenSAML-schemas.wixpdb 
-del OpenSAML-schemas.wixobj
-del OpenSAML-schemas.msm</NMakeCleanCommandLine>
-    <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XM [...]
-    <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="Curl-x64.wxs">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Curl-x86.wxs" />
-    <None Include="FastCGI-x86.wxs" />
-    <None Include="FastCGI-x64.wxs" />
-    <None Include="MergeModules.make" />
-    <None Include="Log4Shib-x64.wxs" />
-    <None Include="Log4Shib-x86.wxs" />
-    <None Include="OpenSAML-schemas.wxs" />
-    <None Include="OpenSAML-x64.wxs">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="OpenSAML-x86.wxs">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="OpenSSL-x64.wxs" />
-    <None Include="OpenSSL-x86.wxs" />
-    <None Include="Shibboleth-schemas.wxs" />
-    <None Include="Shibboleth-x64.wxs" />
-    <None Include="Shibboleth-x86.wxs" />
-    <None Include="Xerces-x64.wxs" />
-    <None Include="Xerces-x86.wxs" />
-    <None Include="XmlSec-x64.wxs" />
-    <None Include="XmlSec-x86.wxs" />
-    <None Include="Zlib-x64.wxs" />
-    <None Include="Zlib-x86.wxs" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/nsapi_shib/.gitignore b/nsapi_shib/.gitignore
index e031e71..1484cd0 100644
--- a/nsapi_shib/.gitignore
+++ b/nsapi_shib/.gitignore
@@ -1,6 +1,4 @@
 /*.plg
-/Release
-/Debug
 /*.dep
 /*.mak
 /*.aps
@@ -8,4 +6,3 @@
 /.deps
 /Makefile.in
 /Makefile
-/*.user
diff --git a/odbc-store/.gitignore b/odbc-store/.gitignore
index 3af948c..589009b 100644
--- a/odbc-store/.gitignore
+++ b/odbc-store/.gitignore
@@ -1,7 +1,3 @@
-/*.user
-/Debug
-/Release
-/x64
 /.deps
 /Makefile.in
 /Makefile
diff --git a/plugins/.gitignore b/plugins/.gitignore
index 5b9f7b4..10a7e8d 100644
--- a/plugins/.gitignore
+++ b/plugins/.gitignore
@@ -1,3 +1 @@
-/Makefile.in
-/plugins-lite-Release/
-/plugins-lite-Debug/
+/Makefile.in
diff --git a/shibd/.gitignore b/shibd/.gitignore
index c803346..da85bd7 100644
--- a/shibd/.gitignore
+++ b/shibd/.gitignore
@@ -7,10 +7,6 @@
 /*.plg
 /testclient___Win32_Debug
 /testclient___Win32_Release
-/Debug
-/Release
 /*.dep
 /*.mak
-/*.user
 /*.aps
-/x64
diff --git a/shibsp/shibsp.vcxproj b/shibsp/shibsp.vcxproj
deleted file mode 100644
index 1cf274f..0000000
--- a/shibsp/shibsp.vcxproj
+++ /dev/null
@@ -1,365 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{81F0F7A6-DC36-46EF-957F-F9E81D4403F6}</ProjectGuid>
-    <RootNamespace>shibsp</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <Import Project="..\..\BuildPath.props" />
-  <Import Project="$(ParentRoot)\Versions.props" />
-  <Import Project="$(ParentRoot)\Includes.props" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)1_5D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_5D</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_5</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_5</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xsec_1D.lib;saml2D.lib;xmltooling1D.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(TargetDir)$(ProjectName)1D.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xsec_1D.lib;saml2D.lib;xmltooling1D.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(TargetDir)$(ProjectName)1D.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xsec_1.lib;saml2.lib;xmltooling1.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(TargetDir)$(ProjectName)1.lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level3</WarningLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xsec_1.lib;saml2.lib;xmltooling1.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(TargetDir)$(ProjectName)1.lib</ImportLibrary>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="AbstractSPRequest.cpp" />
-    <ClCompile Include="Application.cpp" />
-    <ClCompile Include="attribute\Base64AttributeDecoder.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerEntityAttributeFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerEntityMatcherFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterEntityAttributeFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterEntityMatcherFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\DummyAttributeFilter.cpp" />
-    <ClCompile Include="attribute\filtering\impl\NameIDQualifierStringFunctor.cpp" />
-    <ClCompile Include="attribute\resolver\impl\AssertionAttributeExtractor.cpp" />
-    <ClCompile Include="attribute\resolver\impl\MetadataAttributeExtractor.cpp" />
-    <ClCompile Include="binding\impl\XMLProtocolProvider.cpp" />
-    <ClCompile Include="handler\impl\AttributeCheckerHandler.cpp" />
-    <ClCompile Include="handler\impl\DiscoveryFeed.cpp" />
-    <ClCompile Include="handler\impl\ExternalAuthHandler.cpp" />
-    <ClCompile Include="handler\impl\LogoutInitiator.cpp" />
-    <ClCompile Include="handler\impl\SecuredHandler.cpp" />
-    <ClCompile Include="impl\XMLSecurityPolicyProvider.cpp" />
-    <ClCompile Include="ServiceProvider.cpp" />
-    <ClCompile Include="SPConfig.cpp" />
-    <ClCompile Include="util\CGIParser.cpp" />
-    <ClCompile Include="util\DOMPropertySet.cpp" />
-    <ClCompile Include="util\IPRange.cpp" />
-    <ClCompile Include="util\SPConstants.cpp" />
-    <ClCompile Include="util\TemplateParameters.cpp" />
-    <ClCompile Include="security\PKIXTrustEngine.cpp" />
-    <ClCompile Include="security\SecurityPolicy.cpp" />
-    <ClCompile Include="metadata\DynamicMetadataProvider.cpp" />
-    <ClCompile Include="metadata\MetadataExtImpl.cpp" />
-    <ClCompile Include="metadata\MetadataExtSchemaValidators.cpp" />
-    <ClCompile Include="metadata\MetadataProviderCriteria.cpp" />
-    <ClCompile Include="remoting\impl\ddf.cpp" />
-    <ClCompile Include="remoting\impl\ListenerService.cpp" />
-    <ClCompile Include="remoting\impl\SocketListener.cpp" />
-    <ClCompile Include="remoting\impl\TCPListener.cpp" />
-    <ClCompile Include="impl\ChainingAccessControl.cpp" />
-    <ClCompile Include="impl\StorageServiceSessionCache.cpp" />
-    <ClCompile Include="impl\TransactionLog.cpp" />
-    <ClCompile Include="impl\XMLAccessControl.cpp" />
-    <ClCompile Include="impl\XMLRequestMapper.cpp" />
-    <ClCompile Include="impl\XMLServiceProvider.cpp" />
-    <ClCompile Include="attribute\Attribute.cpp" />
-    <ClCompile Include="attribute\BinaryAttribute.cpp" />
-    <ClCompile Include="attribute\DOMAttributeDecoder.cpp" />
-    <ClCompile Include="attribute\ExtensibleAttribute.cpp" />
-    <ClCompile Include="attribute\KeyInfoAttributeDecoder.cpp" />
-    <ClCompile Include="attribute\NameIDAttribute.cpp" />
-    <ClCompile Include="attribute\NameIDAttributeDecoder.cpp" />
-    <ClCompile Include="attribute\NameIDFromScopedAttributeDecoder.cpp" />
-    <ClCompile Include="attribute\ScopedAttribute.cpp" />
-    <ClCompile Include="attribute\ScopedAttributeDecoder.cpp" />
-    <ClCompile Include="attribute\SimpleAttribute.cpp" />
-    <ClCompile Include="attribute\StringAttributeDecoder.cpp" />
-    <ClCompile Include="attribute\XMLAttribute.cpp" />
-    <ClCompile Include="attribute\XMLAttributeDecoder.cpp" />
-    <ClCompile Include="attribute\resolver\impl\ChainingAttributeExtractor.cpp" />
-    <ClCompile Include="attribute\resolver\impl\ChainingAttributeResolver.cpp" />
-    <ClCompile Include="attribute\resolver\impl\DelegationAttributeExtractor.cpp" />
-    <ClCompile Include="attribute\resolver\impl\KeyDescriptorAttributeExtractor.cpp" />
-    <ClCompile Include="attribute\resolver\impl\QueryAttributeResolver.cpp" />
-    <ClCompile Include="attribute\resolver\impl\SimpleAggregationAttributeResolver.cpp" />
-    <ClCompile Include="attribute\resolver\impl\XMLAttributeExtractor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AndMatchFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AnyMatchFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AttributeFilter.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerInEntityGroupFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerRegexFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerStringFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterInEntityGroupFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterRegexFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterStringFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AttributeScopeMatchesShibMDScopeFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AttributeScopeRegexFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AttributeScopeStringFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AttributeValueRegexFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AttributeValueStringFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AuthenticationMethodRegexFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\AuthenticationMethodStringFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\BasicFilteringContext.cpp" />
-    <ClCompile Include="attribute\filtering\impl\ChainingAttributeFilter.cpp" />
-    <ClCompile Include="attribute\filtering\impl\MatchFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\NotMatchFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\NumberOfAttributeValuesFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\OrMatchFunctor.cpp" />
-    <ClCompile Include="attribute\filtering\impl\XMLAttributeFilter.cpp" />
-    <ClCompile Include="binding\impl\ArtifactResolver.cpp" />
-    <ClCompile Include="binding\impl\SOAPClient.cpp" />
-    <ClCompile Include="handler\impl\AbstractHandler.cpp" />
-    <ClCompile Include="handler\impl\AssertionConsumerService.cpp" />
-    <ClCompile Include="handler\impl\AssertionLookup.cpp" />
-    <ClCompile Include="handler\impl\ChainingLogoutInitiator.cpp" />
-    <ClCompile Include="handler\impl\ChainingSessionInitiator.cpp" />
-    <ClCompile Include="handler\impl\CookieSessionInitiator.cpp" />
-    <ClCompile Include="handler\impl\FormSessionInitiator.cpp" />
-    <ClCompile Include="handler\impl\LocalLogoutInitiator.cpp" />
-    <ClCompile Include="handler\impl\LogoutHandler.cpp" />
-    <ClCompile Include="handler\impl\MetadataGenerator.cpp" />
-    <ClCompile Include="handler\impl\RemotedHandler.cpp" />
-    <ClCompile Include="handler\impl\SAML1Consumer.cpp" />
-    <ClCompile Include="handler\impl\SAML2ArtifactResolution.cpp" />
-    <ClCompile Include="handler\impl\SAML2Consumer.cpp" />
-    <ClCompile Include="handler\impl\SAML2Logout.cpp" />
-    <ClCompile Include="handler\impl\SAML2LogoutInitiator.cpp" />
-    <ClCompile Include="handler\impl\SAML2NameIDMgmt.cpp" />
-    <ClCompile Include="handler\impl\SAML2SessionInitiator.cpp" />
-    <ClCompile Include="handler\impl\SAMLDSSessionInitiator.cpp" />
-    <ClCompile Include="handler\impl\SessionHandler.cpp" />
-    <ClCompile Include="handler\impl\SessionInitiator.cpp" />
-    <ClCompile Include="handler\impl\Shib1SessionInitiator.cpp" />
-    <ClCompile Include="handler\impl\StatusHandler.cpp" />
-    <ClCompile Include="handler\impl\TransformSessionInitiator.cpp" />
-    <ClCompile Include="handler\impl\WAYFSessionInitiator.cpp" />
-    <ClCompile Include="version.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="binding\ProtocolProvider.h" />
-    <ClInclude Include="GSSRequest.h" />
-    <ClInclude Include="handler\LogoutInitiator.h" />
-    <ClInclude Include="handler\SecuredHandler.h" />
-    <ClInclude Include="remoting\impl\SocketListener.h" />
-    <ClInclude Include="AbstractSPRequest.h" />
-    <ClInclude Include="AccessControl.h" />
-    <ClInclude Include="Application.h" />
-    <ClInclude Include="base.h" />
-    <ClInclude Include="config_pub_win32.h" />
-    <ClInclude Include="exceptions.h" />
-    <ClInclude Include="internal.h" />
-    <ClInclude Include="RequestMapper.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="security\SecurityPolicyProvider.h" />
-    <ClInclude Include="ServiceProvider.h" />
-    <ClInclude Include="SessionCache.h" />
-    <ClInclude Include="SessionCacheEx.h" />
-    <ClInclude Include="SPConfig.h" />
-    <ClInclude Include="SPRequest.h" />
-    <ClInclude Include="TransactionLog.h" />
-    <ClInclude Include="version.h" />
-    <ClInclude Include="util\CGIParser.h" />
-    <ClInclude Include="util\DOMPropertySet.h" />
-    <ClInclude Include="util\IPRange.h" />
-    <ClInclude Include="util\PropertySet.h" />
-    <ClInclude Include="util\SPConstants.h" />
-    <ClInclude Include="util\TemplateParameters.h" />
-    <ClInclude Include="security\PKIXTrustEngine.h" />
-    <ClInclude Include="security\SecurityPolicy.h" />
-    <ClInclude Include="remoting\ddf.h" />
-    <ClInclude Include="remoting\ListenerService.h" />
-    <ClInclude Include="attribute\Attribute.h" />
-    <ClInclude Include="attribute\BinaryAttribute.h" />
-    <ClInclude Include="attribute\AttributeDecoder.h" />
-    <ClInclude Include="attribute\ExtensibleAttribute.h" />
-    <ClInclude Include="attribute\NameIDAttribute.h" />
-    <ClInclude Include="attribute\ScopedAttribute.h" />
-    <ClInclude Include="attribute\SimpleAttribute.h" />
-    <ClInclude Include="attribute\XMLAttribute.h" />
-    <ClInclude Include="attribute\resolver\AttributeExtractor.h" />
-    <ClInclude Include="attribute\resolver\AttributeResolver.h" />
-    <ClInclude Include="attribute\resolver\ResolutionContext.h" />
-    <ClInclude Include="attribute\filtering\AttributeFilter.h" />
-    <ClInclude Include="attribute\filtering\BasicFilteringContext.h" />
-    <ClInclude Include="attribute\filtering\FilteringContext.h" />
-    <ClInclude Include="attribute\filtering\FilterPolicyContext.h" />
-    <ClInclude Include="attribute\filtering\MatchFunctor.h" />
-    <ClInclude Include="binding\ArtifactResolver.h" />
-    <ClInclude Include="binding\SOAPClient.h" />
-    <ClInclude Include="handler\AbstractHandler.h" />
-    <ClInclude Include="handler\AssertionConsumerService.h" />
-    <ClInclude Include="handler\Handler.h" />
-    <ClInclude Include="handler\LogoutHandler.h" />
-    <ClInclude Include="handler\RemotedHandler.h" />
-    <ClInclude Include="handler\SessionInitiator.h" />
-    <ClInclude Include="metadata\MetadataExt.h" />
-    <ClInclude Include="metadata\MetadataProviderCriteria.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="shibsp.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile.am" />
-    <None Include="paths.h.in" />
-    <None Include="config_pub.h.in" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git

More information about the Pkg-shibboleth-devel mailing list