From: Scott Cantor <cantor.2@osu.edu>
Date: Tue, 3 May 2016 20:45:34 +0000 (-0400)
Subject: Recreate filter assignments for source files
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=2c7da837d9fc6f8d96c9bd23df32c6202ab0dd09

Recreate filter assignments for source files
---

diff --git a/Projects/vc10/shibsp/shibsp-lite.vcxproj.filters b/Projects/vc10/shibsp/shibsp-lite.vcxproj.filters
index 210e6b2..906103e 100644
--- a/Projects/vc10/shibsp/shibsp-lite.vcxproj.filters
+++ b/Projects/vc10/shibsp/shibsp-lite.vcxproj.filters
@@ -63,323 +63,323 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="AbstractSPRequest.cpp">
+    <ClCompile Include="..\..\..\shibsp\AbstractSPRequest.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Application.cpp">
+    <ClCompile Include="..\..\..\shibsp\Application.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ServiceProvider.cpp">
+    <ClCompile Include="..\..\..\shibsp\ServiceProvider.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SPConfig.cpp">
+    <ClCompile Include="..\..\..\shibsp\SPConfig.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="util\CGIParser.cpp">
-      <Filter>Source Files\util</Filter>
-    </ClCompile>
-    <ClCompile Include="util\DOMPropertySet.cpp">
-      <Filter>Source Files\util</Filter>
-    </ClCompile>
-    <ClCompile Include="util\IPRange.cpp">
-      <Filter>Source Files\util</Filter>
-    </ClCompile>
-    <ClCompile Include="util\SPConstants.cpp">
-      <Filter>Source Files\util</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\SPConstants.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="util\TemplateParameters.cpp">
-      <Filter>Source Files\util</Filter>
+    <ClCompile Include="..\..\..\shibsp\lite\SAMLConstants.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="remoting\impl\ddf.cpp">
-      <Filter>Source Files\remoting\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\version.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="remoting\impl\ListenerService.cpp">
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\TCPListener.cpp">
       <Filter>Source Files\remoting\impl</Filter>
     </ClCompile>
-    <ClCompile Include="remoting\impl\SocketListener.cpp">
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\SocketListener.cpp">
       <Filter>Source Files\remoting\impl</Filter>
     </ClCompile>
-    <ClCompile Include="remoting\impl\TCPListener.cpp">
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ddf.cpp">
       <Filter>Source Files\remoting\impl</Filter>
     </ClCompile>
-    <ClCompile Include="impl\ChainingAccessControl.cpp">
-      <Filter>Source Files\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="impl\StorageServiceSessionCache.cpp">
-      <Filter>Source Files\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="impl\XMLAccessControl.cpp">
-      <Filter>Source Files\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="impl\XMLRequestMapper.cpp">
-      <Filter>Source Files\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="impl\XMLServiceProvider.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\BinaryAttribute.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\Attribute.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\Attribute.cpp">
       <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\ExtensibleAttribute.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\ExtensibleAttribute.cpp">
       <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\NameIDAttribute.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttribute.cpp">
       <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\ScopedAttribute.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttribute.cpp">
       <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\SimpleAttribute.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\SimpleAttribute.cpp">
       <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\XMLAttribute.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\XMLAttribute.cpp">
       <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\AbstractHandler.cpp">
+    <ClCompile Include="..\..\..\shibsp\binding\impl\XMLProtocolProvider.cpp">
+      <Filter>Source Files\binding\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\util\DOMPropertySet.cpp">
+      <Filter>Source Files\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\util\CGIParser.cpp">
+      <Filter>Source Files\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\util\IPRange.cpp">
+      <Filter>Source Files\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\util\TemplateParameters.cpp">
+      <Filter>Source Files\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ListenerService.cpp">
+      <Filter>Source Files\remoting\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\lite\CommonDomainCookie.cpp">
+      <Filter>Source Files\lite</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionConsumerService.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\AssertionConsumerService.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionLookup.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\AssertionLookup.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AttributeCheckerHandler.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\ChainingLogoutInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingLogoutInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\ChainingSessionInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingSessionInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\CookieSessionInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\CookieSessionInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\FormSessionInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\DiscoveryFeed.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\LocalLogoutInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ExternalAuthHandler.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\LogoutHandler.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\FormSessionInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\MetadataGenerator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LocalLogoutInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\RemotedHandler.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutHandler.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML1Consumer.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2ArtifactResolution.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\MetadataGenerator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2Consumer.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\RemotedHandler.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2Logout.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML1Consumer.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2LogoutInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2ArtifactResolution.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2NameIDMgmt.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Consumer.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2SessionInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Logout.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAMLDSSessionInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2LogoutInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SessionHandler.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2NameIDMgmt.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SessionInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2SessionInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\Shib1SessionInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAMLDSSessionInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\StatusHandler.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SecuredHandler.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\TransformSessionInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionHandler.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\WAYFSessionInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="lite\CommonDomainCookie.cpp">
-      <Filter>Source Files\lite</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\Shib1SessionInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="lite\SAMLConstants.cpp">
-      <Filter>Source Files\lite</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\TransformSessionInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\LogoutInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\WAYFSessionInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\XMLProtocolProvider.cpp">
-      <Filter>Source Files\binding\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\ChainingAccessControl.cpp">
+      <Filter>Source Files\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\DiscoveryFeed.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\StorageServiceSessionCache.cpp">
+      <Filter>Source Files\impl</Filter>
     </ClCompile>
-    <ClCompile Include="version.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLServiceProvider.cpp">
+      <Filter>Source Files\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\BinaryAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLAccessControl.cpp">
+      <Filter>Source Files\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\AttributeCheckerHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLRequestMapper.cpp">
+      <Filter>Source Files\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SecuredHandler.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\StatusHandler.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\ExternalAuthHandler.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AbstractHandler.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="remoting\impl\SocketListener.h">
-      <Filter>Source Files\remoting\impl</Filter>
+    <ClInclude Include="..\..\..\shibsp\GSSRequest.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="AbstractSPRequest.h">
+    <ClInclude Include="..\..\..\shibsp\AbstractSPRequest.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="AccessControl.h">
+    <ClInclude Include="..\..\..\shibsp\AccessControl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Application.h">
+    <ClInclude Include="..\..\..\shibsp\Application.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="base.h">
+    <ClInclude Include="..\..\..\shibsp\base.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="exceptions.h">
+    <ClInclude Include="..\..\..\shibsp\config_pub_win32.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="internal.h">
+    <ClInclude Include="..\..\..\shibsp\exceptions.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="RequestMapper.h">
+    <ClInclude Include="..\..\..\shibsp\internal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="..\..\..\shibsp\RequestMapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ServiceProvider.h">
+    <ClInclude Include="..\..\..\shibsp\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SessionCache.h">
+    <ClInclude Include="..\..\..\shibsp\ServiceProvider.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SessionCacheEx.h">
+    <ClInclude Include="..\..\..\shibsp\SessionCache.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SPConfig.h">
+    <ClInclude Include="..\..\..\shibsp\SessionCacheEx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SPRequest.h">
+    <ClInclude Include="..\..\..\shibsp\SPConfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="version.h">
+    <ClInclude Include="..\..\..\shibsp\SPRequest.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\CGIParser.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\version.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\DOMPropertySet.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\SPConstants.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\IPRange.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\lite\SAMLConstants.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\PropertySet.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\Attribute.h">
+      <Filter>Header Files\attribute</Filter>
     </ClInclude>
-    <ClInclude Include="util\SPConstants.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\BinaryAttribute.h">
+      <Filter>Header Files\attribute</Filter>
     </ClInclude>
-    <ClInclude Include="util\TemplateParameters.h">
-      <Filter>Header Files\util</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\ScopedAttribute.h">
+      <Filter>Header Files\attribute</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\shibsp\attribute\SimpleAttribute.h">
+      <Filter>Header Files\attribute</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\shibsp\attribute\XMLAttribute.h">
+      <Filter>Header Files\attribute</Filter>
     </ClInclude>
-    <ClInclude Include="remoting\ddf.h">
+    <ClInclude Include="..\..\..\shibsp\attribute\ExtensibleAttribute.h">
+      <Filter>Header Files\attribute</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\shibsp\binding\ProtocolProvider.h">
+      <Filter>Header Files\binding</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\shibsp\remoting\ListenerService.h">
       <Filter>Header Files\remoting</Filter>
     </ClInclude>
-    <ClInclude Include="remoting\ListenerService.h">
+    <ClInclude Include="..\..\..\shibsp\remoting\impl\SocketListener.h">
       <Filter>Header Files\remoting</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\Attribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\remoting\ddf.h">
+      <Filter>Header Files\remoting</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\ExtensibleAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\lite\CommonDomainCookie.h">
+      <Filter>Header Files\lite</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\NameIDAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\IPRange.h">
+      <Filter>Header Files\util</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\ScopedAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\DOMPropertySet.h">
+      <Filter>Header Files\util</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\SimpleAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\PropertySet.h">
+      <Filter>Header Files\util</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\XMLAttribute.h">
+    <ClInclude Include="..\..\..\shibsp\attribute\NameIDAttribute.h">
       <Filter>Header Files\attribute</Filter>
     </ClInclude>
-    <ClInclude Include="handler\AbstractHandler.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\CGIParser.h">
+      <Filter>Header Files\util</Filter>
     </ClInclude>
-    <ClInclude Include="handler\AssertionConsumerService.h">
+    <ClInclude Include="..\..\..\shibsp\handler\AssertionConsumerService.h">
       <Filter>Header Files\handler</Filter>
     </ClInclude>
-    <ClInclude Include="handler\Handler.h">
+    <ClInclude Include="..\..\..\shibsp\handler\AbstractHandler.h">
       <Filter>Header Files\handler</Filter>
     </ClInclude>
-    <ClInclude Include="handler\LogoutHandler.h">
+    <ClInclude Include="..\..\..\shibsp\handler\LogoutHandler.h">
       <Filter>Header Files\handler</Filter>
     </ClInclude>
-    <ClInclude Include="handler\RemotedHandler.h">
+    <ClInclude Include="..\..\..\shibsp\handler\LogoutInitiator.h">
       <Filter>Header Files\handler</Filter>
     </ClInclude>
-    <ClInclude Include="handler\SessionInitiator.h">
+    <ClInclude Include="..\..\..\shibsp\handler\RemotedHandler.h">
       <Filter>Header Files\handler</Filter>
     </ClInclude>
-    <ClInclude Include="lite\CommonDomainCookie.h">
-      <Filter>Header Files\lite</Filter>
-    </ClInclude>
-    <ClInclude Include="lite\SAMLConstants.h">
-      <Filter>Header Files\lite</Filter>
-    </ClInclude>
-    <ClInclude Include="handler\LogoutInitiator.h">
+    <ClInclude Include="..\..\..\shibsp\handler\SessionInitiator.h">
       <Filter>Header Files\handler</Filter>
     </ClInclude>
-    <ClInclude Include="binding\ProtocolProvider.h">
-      <Filter>Header Files\binding</Filter>
-    </ClInclude>
-    <ClInclude Include="GSSRequest.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="config_pub_win32.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="attribute\BinaryAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\handler\SecuredHandler.h">
+      <Filter>Header Files\handler</Filter>
     </ClInclude>
-    <ClInclude Include="handler\SecuredHandler.h">
+    <ClInclude Include="..\..\..\shibsp\handler\Handler.h">
       <Filter>Header Files\handler</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\shibsp\util\TemplateParameters.h">
+      <Filter>Header Files\util</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="shibsp.rc">
+    <ResourceCompile Include="..\..\..\shibsp\shibsp.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </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>
 </Project>
\ No newline at end of file
diff --git a/Projects/vc10/shibsp/shibsp.vcxproj.filters b/Projects/vc10/shibsp/shibsp.vcxproj.filters
index 471b777..1819d1f 100644
--- a/Projects/vc10/shibsp/shibsp.vcxproj.filters
+++ b/Projects/vc10/shibsp/shibsp.vcxproj.filters
@@ -87,530 +87,530 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="AbstractSPRequest.cpp">
+    <ClCompile Include="..\..\..\shibsp\AbstractSPRequest.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Application.cpp">
+    <ClCompile Include="..\..\..\shibsp\Application.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="ServiceProvider.cpp">
+    <ClCompile Include="..\..\..\shibsp\ServiceProvider.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="SPConfig.cpp">
+    <ClCompile Include="..\..\..\shibsp\SPConfig.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="util\CGIParser.cpp">
-      <Filter>Source Files\util</Filter>
-    </ClCompile>
-    <ClCompile Include="util\DOMPropertySet.cpp">
-      <Filter>Source Files\util</Filter>
-    </ClCompile>
-    <ClCompile Include="util\IPRange.cpp">
-      <Filter>Source Files\util</Filter>
-    </ClCompile>
-    <ClCompile Include="util\SPConstants.cpp">
-      <Filter>Source Files\util</Filter>
-    </ClCompile>
-    <ClCompile Include="util\TemplateParameters.cpp">
-      <Filter>Source Files\util</Filter>
-    </ClCompile>
-    <ClCompile Include="security\PKIXTrustEngine.cpp">
-      <Filter>Source Files\security</Filter>
-    </ClCompile>
-    <ClCompile Include="security\SecurityPolicy.cpp">
-      <Filter>Source Files\security</Filter>
-    </ClCompile>
-    <ClCompile Include="metadata\DynamicMetadataProvider.cpp">
-      <Filter>Source Files\metadata</Filter>
-    </ClCompile>
-    <ClCompile Include="metadata\MetadataExtImpl.cpp">
-      <Filter>Source Files\metadata</Filter>
-    </ClCompile>
-    <ClCompile Include="metadata\MetadataExtSchemaValidators.cpp">
-      <Filter>Source Files\metadata</Filter>
-    </ClCompile>
-    <ClCompile Include="metadata\MetadataProviderCriteria.cpp">
-      <Filter>Source Files\metadata</Filter>
-    </ClCompile>
-    <ClCompile Include="remoting\impl\ddf.cpp">
-      <Filter>Source Files\remoting\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\SPConstants.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="remoting\impl\ListenerService.cpp">
-      <Filter>Source Files\remoting\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\version.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="remoting\impl\SocketListener.cpp">
-      <Filter>Source Files\remoting\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AnyMatchFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="remoting\impl\TCPListener.cpp">
-      <Filter>Source Files\remoting\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AndMatchFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="impl\ChainingAccessControl.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerEntityAttributeFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="impl\StorageServiceSessionCache.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerEntityMatcherFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="impl\TransactionLog.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerInEntityGroupFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="impl\XMLAccessControl.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerRegexFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="impl\XMLRequestMapper.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerStringFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="impl\XMLServiceProvider.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterEntityAttributeFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\Attribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterEntityMatcherFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\BinaryAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterInEntityGroupFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\DOMAttributeDecoder.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterRegexFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\ExtensibleAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterStringFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\KeyInfoAttributeDecoder.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeScopeMatchesShibMDScopeFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\NameIDAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeScopeRegexFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\NameIDAttributeDecoder.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeScopeStringFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\NameIDFromScopedAttributeDecoder.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeValueRegexFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\ScopedAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeValueStringFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\ScopedAttributeDecoder.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AuthenticationMethodRegexFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\SimpleAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AuthenticationMethodStringFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\StringAttributeDecoder.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NameIDQualifierStringFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\XMLAttribute.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NumberOfAttributeValuesFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\XMLAttributeDecoder.cpp">
-      <Filter>Source Files\attribute</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\XMLAttributeFilter.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\ChainingAttributeExtractor.cpp">
-      <Filter>Source Files\attribute\resolver\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\ChainingAttributeFilter.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\ChainingAttributeResolver.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\ChainingAttributeExtractor.cpp">
       <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\DelegationAttributeExtractor.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\ChainingAttributeResolver.cpp">
       <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\KeyDescriptorAttributeExtractor.cpp">
-      <Filter>Source Files\attribute\resolver\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionLookup.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\QueryAttributeResolver.cpp">
-      <Filter>Source Files\attribute\resolver\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionConsumerService.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\SimpleAggregationAttributeResolver.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\AssertionAttributeExtractor.cpp">
       <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\XMLAttributeExtractor.cpp">
-      <Filter>Source Files\attribute\resolver\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\binding\impl\ArtifactResolver.cpp">
+      <Filter>Source Files\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AndMatchFunctor.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\BasicFilteringContext.cpp">
       <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AnyMatchFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AttributeCheckerHandler.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeFilter.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeFilter.cpp">
       <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerInEntityGroupFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\Attribute.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerRegexFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\Base64AttributeDecoder.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerStringFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\BinaryAttribute.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterInEntityGroupFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\DOMAttributeDecoder.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterRegexFunctor.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\DummyAttributeFilter.cpp">
       <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterStringFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\CGIParser.cpp">
+      <Filter>Source Files\util</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeScopeMatchesShibMDScopeFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingLogoutInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeScopeRegexFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingSessionInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeScopeStringFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\CookieSessionInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeValueRegexFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\KeyDescriptorAttributeExtractor.cpp">
+      <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeValueStringFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\metadata\DynamicMetadataProvider.cpp">
+      <Filter>Source Files\metadata</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AuthenticationMethodRegexFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ListenerService.cpp">
+      <Filter>Source Files\remoting\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AuthenticationMethodStringFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ddf.cpp">
+      <Filter>Source Files\remoting\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\BasicFilteringContext.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AbstractHandler.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\ChainingAttributeFilter.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\ChainingAccessControl.cpp">
+      <Filter>Source Files\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\MatchFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\DelegationAttributeExtractor.cpp">
+      <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\NotMatchFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LocalLogoutInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\NumberOfAttributeValuesFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutHandler.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\OrMatchFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\XMLAttributeFilter.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\MatchFunctor.cpp">
       <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\ArtifactResolver.cpp">
-      <Filter>Source Files\binding\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="binding\impl\SOAPClient.cpp">
-      <Filter>Source Files\binding\impl</Filter>
-    </ClCompile>
-    <ClCompile Include="handler\impl\AbstractHandler.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\RemotedHandler.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\AssertionConsumerService.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML1Consumer.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\AssertionLookup.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2ArtifactResolution.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\ChainingLogoutInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Consumer.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\ChainingSessionInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Logout.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\CookieSessionInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2LogoutInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\FormSessionInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2NameIDMgmt.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\LocalLogoutInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2SessionInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\LogoutHandler.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAMLDSSessionInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\MetadataGenerator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\DiscoveryFeed.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\RemotedHandler.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\MetadataGenerator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML1Consumer.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\DOMPropertySet.cpp">
+      <Filter>Source Files\util</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2ArtifactResolution.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\ExtensibleAttribute.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2Consumer.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\KeyInfoAttributeDecoder.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2Logout.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\MetadataAttributeExtractor.cpp">
+      <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2LogoutInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ExternalAuthHandler.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2NameIDMgmt.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\FormSessionInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAML2SessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\IPRange.cpp">
+      <Filter>Source Files\util</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SAMLDSSessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\metadata\MetadataExtImpl.cpp">
+      <Filter>Source Files\metadata</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SessionHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\metadata\MetadataExtSchemaValidators.cpp">
+      <Filter>Source Files\metadata</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\metadata\MetadataProviderCriteria.cpp">
+      <Filter>Source Files\metadata</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\Shib1SessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttribute.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\StatusHandler.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttributeDecoder.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\TransformSessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDFromScopedAttributeDecoder.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\WAYFSessionInitiator.cpp">
-      <Filter>Source Files\handler\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NotMatchFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="impl\XMLSecurityPolicyProvider.cpp">
-      <Filter>Source Files\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\OrMatchFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\LogoutInitiator.cpp">
+    <ClCompile Include="..\..\..\shibsp\security\PKIXTrustEngine.cpp">
+      <Filter>Source Files\security</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SecuredHandler.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="binding\impl\XMLProtocolProvider.cpp">
-      <Filter>Source Files\binding\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\SocketListener.cpp">
+      <Filter>Source Files\remoting\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\DiscoveryFeed.cpp">
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\TCPListener.cpp">
+      <Filter>Source Files\remoting\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\WAYFSessionInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\Base64AttributeDecoder.cpp">
+    <ClCompile Include="..\..\..\shibsp\impl\XMLAccessControl.cpp">
+      <Filter>Source Files\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLServiceProvider.cpp">
+      <Filter>Source Files\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLRequestMapper.cpp">
+      <Filter>Source Files\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\attribute\XMLAttribute.cpp">
       <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\NameIDQualifierStringFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\XMLAttributeDecoder.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\DummyAttributeFilter.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttribute.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="version.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttributeDecoder.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\AssertionAttributeExtractor.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\QueryAttributeResolver.cpp">
       <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\resolver\impl\MetadataAttributeExtractor.cpp">
-      <Filter>Source Files\attribute\resolver\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionHandler.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\AttributeCheckerHandler.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerEntityAttributeFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\Shib1SessionInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterEntityAttributeFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\SimpleAggregationAttributeResolver.cpp">
+      <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerEntityMatcherFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\SimpleAttribute.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterEntityMatcherFunctor.cpp">
-      <Filter>Source Files\attribute\filtering\impl</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\StorageServiceSessionCache.cpp">
+      <Filter>Source Files\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\attribute\StringAttributeDecoder.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\SecuredHandler.cpp">
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\XMLAttributeExtractor.cpp">
+      <Filter>Source Files\attribute\resolver\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\util\TemplateParameters.cpp">
+      <Filter>Source Files\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\TransformSessionInitiator.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="handler\impl\ExternalAuthHandler.cpp">
+    <ClCompile Include="..\..\..\shibsp\handler\impl\StatusHandler.cpp">
       <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\binding\impl\XMLProtocolProvider.cpp">
+      <Filter>Source Files\binding\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLSecurityPolicyProvider.cpp">
+      <Filter>Source Files\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\binding\impl\SOAPClient.cpp">
+      <Filter>Source Files\binding\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\impl\TransactionLog.cpp">
+      <Filter>Source Files\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\security\SecurityPolicy.cpp">
+      <Filter>Source Files\security</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="remoting\impl\SocketListener.h">
-      <Filter>Source Files\remoting\impl</Filter>
-    </ClInclude>
-    <ClInclude Include="AbstractSPRequest.h">
+    <ClInclude Include="..\..\..\shibsp\GSSRequest.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="AccessControl.h">
+    <ClInclude Include="..\..\..\shibsp\AbstractSPRequest.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Application.h">
+    <ClInclude Include="..\..\..\shibsp\AccessControl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="base.h">
+    <ClInclude Include="..\..\..\shibsp\Application.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="exceptions.h">
+    <ClInclude Include="..\..\..\shibsp\base.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="internal.h">
+    <ClInclude Include="..\..\..\shibsp\config_pub_win32.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="RequestMapper.h">
+    <ClInclude Include="..\..\..\shibsp\exceptions.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="..\..\..\shibsp\internal.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="ServiceProvider.h">
+    <ClInclude Include="..\..\..\shibsp\RequestMapper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SessionCache.h">
+    <ClInclude Include="..\..\..\shibsp\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SessionCacheEx.h">
+    <ClInclude Include="..\..\..\shibsp\ServiceProvider.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SPConfig.h">
+    <ClInclude Include="..\..\..\shibsp\SessionCache.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="SPRequest.h">
+    <ClInclude Include="..\..\..\shibsp\SessionCacheEx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="TransactionLog.h">
+    <ClInclude Include="..\..\..\shibsp\SPConfig.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="version.h">
+    <ClInclude Include="..\..\..\shibsp\SPRequest.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="util\CGIParser.h">
-      <Filter>Header Files\util</Filter>
-    </ClInclude>
-    <ClInclude Include="util\DOMPropertySet.h">
-      <Filter>Header Files\util</Filter>
-    </ClInclude>
-    <ClInclude Include="util\IPRange.h">
-      <Filter>Header Files\util</Filter>
-    </ClInclude>
-    <ClInclude Include="util\PropertySet.h">
-      <Filter>Header Files\util</Filter>
-    </ClInclude>
-    <ClInclude Include="util\SPConstants.h">
-      <Filter>Header Files\util</Filter>
-    </ClInclude>
-    <ClInclude Include="util\TemplateParameters.h">
-      <Filter>Header Files\util</Filter>
-    </ClInclude>
-    <ClInclude Include="security\PKIXTrustEngine.h">
-      <Filter>Header Files\security</Filter>
+    <ClInclude Include="..\..\..\shibsp\TransactionLog.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="security\SecurityPolicy.h">
-      <Filter>Header Files\security</Filter>
+    <ClInclude Include="..\..\..\shibsp\version.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="remoting\ddf.h">
-      <Filter>Header Files\remoting</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\SPConstants.h">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="remoting\ListenerService.h">
-      <Filter>Header Files\remoting</Filter>
+    <ClInclude Include="..\..\..\shibsp\handler\AssertionConsumerService.h">
+      <Filter>Header Files\handler</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\Attribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\binding\ArtifactResolver.h">
+      <Filter>Header Files\binding</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\AttributeDecoder.h">
+    <ClInclude Include="..\..\..\shibsp\attribute\Attribute.h">
       <Filter>Header Files\attribute</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\ExtensibleAttribute.h">
+    <ClInclude Include="..\..\..\shibsp\attribute\AttributeDecoder.h">
       <Filter>Header Files\attribute</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\NameIDAttribute.h">
+    <ClInclude Include="..\..\..\shibsp\attribute\BinaryAttribute.h">
       <Filter>Header Files\attribute</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\ScopedAttribute.h">
+    <ClInclude Include="..\..\..\shibsp\attribute\NameIDAttribute.h">
       <Filter>Header Files\attribute</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\SimpleAttribute.h">
+    <ClInclude Include="..\..\..\shibsp\attribute\XMLAttribute.h">
       <Filter>Header Files\attribute</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\XMLAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\AttributeFilter.h">
+      <Filter>Header Files\attribute\filtering</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\resolver\AttributeExtractor.h">
-      <Filter>Header Files\attribute\resolver</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\BasicFilteringContext.h">
+      <Filter>Header Files\attribute\filtering</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\resolver\AttributeResolver.h">
+    <ClInclude Include="..\..\..\shibsp\attribute\resolver\AttributeExtractor.h">
       <Filter>Header Files\attribute\resolver</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\resolver\ResolutionContext.h">
+    <ClInclude Include="..\..\..\shibsp\attribute\resolver\AttributeResolver.h">
       <Filter>Header Files\attribute\resolver</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\filtering\AttributeFilter.h">
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\MatchFunctor.h">
       <Filter>Header Files\attribute\filtering</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\filtering\BasicFilteringContext.h">
-      <Filter>Header Files\attribute\filtering</Filter>
+    <ClInclude Include="..\..\..\shibsp\handler\LogoutHandler.h">
+      <Filter>Header Files\handler</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\filtering\FilteringContext.h">
-      <Filter>Header Files\attribute\filtering</Filter>
+    <ClInclude Include="..\..\..\shibsp\handler\LogoutInitiator.h">
+      <Filter>Header Files\handler</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\filtering\FilterPolicyContext.h">
-      <Filter>Header Files\attribute\filtering</Filter>
+    <ClInclude Include="..\..\..\shibsp\handler\AbstractHandler.h">
+      <Filter>Header Files\handler</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\filtering\MatchFunctor.h">
-      <Filter>Header Files\attribute\filtering</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\CGIParser.h">
+      <Filter>Header Files\util</Filter>
     </ClInclude>
-    <ClInclude Include="binding\ArtifactResolver.h">
-      <Filter>Header Files\binding</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\DOMPropertySet.h">
+      <Filter>Header Files\util</Filter>
     </ClInclude>
-    <ClInclude Include="binding\SOAPClient.h">
-      <Filter>Header Files\binding</Filter>
+    <ClInclude Include="..\..\..\shibsp\remoting\ddf.h">
+      <Filter>Header Files\remoting</Filter>
     </ClInclude>
-    <ClInclude Include="handler\AbstractHandler.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\ExtensibleAttribute.h">
+      <Filter>Header Files\attribute</Filter>
     </ClInclude>
-    <ClInclude Include="handler\AssertionConsumerService.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\PropertySet.h">
+      <Filter>Header Files\util</Filter>
     </ClInclude>
-    <ClInclude Include="handler\Handler.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\binding\ProtocolProvider.h">
+      <Filter>Header Files\binding</Filter>
     </ClInclude>
-    <ClInclude Include="handler\LogoutHandler.h">
+    <ClInclude Include="..\..\..\shibsp\handler\RemotedHandler.h">
       <Filter>Header Files\handler</Filter>
     </ClInclude>
-    <ClInclude Include="handler\RemotedHandler.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\resolver\ResolutionContext.h">
+      <Filter>Header Files\attribute\resolver</Filter>
     </ClInclude>
-    <ClInclude Include="handler\SessionInitiator.h">
-      <Filter>Header Files\handler</Filter>
+    <ClInclude Include="..\..\..\shibsp\security\PKIXTrustEngine.h">
+      <Filter>Header Files\security</Filter>
     </ClInclude>
-    <ClInclude Include="metadata\MetadataExt.h">
+    <ClInclude Include="..\..\..\shibsp\metadata\MetadataExt.h">
       <Filter>Header Files\metadata</Filter>
     </ClInclude>
-    <ClInclude Include="metadata\MetadataProviderCriteria.h">
+    <ClInclude Include="..\..\..\shibsp\metadata\MetadataProviderCriteria.h">
       <Filter>Header Files\metadata</Filter>
     </ClInclude>
-    <ClInclude Include="security\SecurityPolicyProvider.h">
-      <Filter>Header Files\security</Filter>
-    </ClInclude>
-    <ClInclude Include="handler\LogoutInitiator.h">
+    <ClInclude Include="..\..\..\shibsp\handler\Handler.h">
       <Filter>Header Files\handler</Filter>
     </ClInclude>
-    <ClInclude Include="binding\ProtocolProvider.h">
-      <Filter>Header Files\binding</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\FilteringContext.h">
+      <Filter>Header Files\attribute\filtering</Filter>
     </ClInclude>
-    <ClInclude Include="GSSRequest.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\FilterPolicyContext.h">
+      <Filter>Header Files\attribute\filtering</Filter>
     </ClInclude>
-    <ClInclude Include="config_pub_win32.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\..\..\shibsp\remoting\ListenerService.h">
+      <Filter>Header Files\remoting</Filter>
     </ClInclude>
-    <ClInclude Include="attribute\BinaryAttribute.h">
-      <Filter>Header Files\attribute</Filter>
+    <ClInclude Include="..\..\..\shibsp\util\IPRange.h">
+      <Filter>Header Files\util</Filter>
     </ClInclude>
-    <ClInclude Include="handler\SecuredHandler.h">
+    <ClInclude Include="..\..\..\shibsp\handler\SecuredHandler.h">
       <Filter>Header Files\handler</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\shibsp\handler\SessionInitiator.h">
+      <Filter>Header Files\handler</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\shibsp\attribute\ScopedAttribute.h">
+      <Filter>Header Files\attribute</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\shibsp\attribute\SimpleAttribute.h">
+      <Filter>Header Files\attribute</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\shibsp\util\TemplateParameters.h">
+      <Filter>Header Files\util</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\shibsp\remoting\impl\SocketListener.h">
+      <Filter>Header Files\remoting</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\shibsp\binding\SOAPClient.h">
+      <Filter>Header Files\binding</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\shibsp\security\SecurityPolicy.h">
+      <Filter>Header Files\security</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\shibsp\security\SecurityPolicyProvider.h">
+      <Filter>Header Files\security</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="shibsp.rc">
+    <ResourceCompile Include="..\..\..\shibsp\shibsp.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </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>
 </Project>
\ No newline at end of file