SSPCPP-689 Move up to VC14: Move cpp files into appropriate folders
authorRod Widdowson <rdw@steadingsoftware.com>
Mon, 16 May 2016 10:06:33 +0000 (11:06 +0100)
committerRod Widdowson <rdw@steadingsoftware.com>
Mon, 16 May 2016 10:23:41 +0000 (11:23 +0100)
https://issues.shibboleth.net/jira/browse/SSPCPP-689

Somewhere down the line the project structure got lost.
Restore

Projects/vc14/shibsp/shibsp-lite.vcxproj.filters
Projects/vc14/shibsp/shibsp.vcxproj.filters

index 04aace3..6a751b6 100644 (file)
     <ClCompile Include="..\..\..\shibsp\Application.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\binding\impl\XMLProtocolProvider.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\AttributeCheckerHandler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\DiscoveryFeed.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\ExternalAuthHandler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutInitiator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\SecuredHandler.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\shibsp\ServiceProvider.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\SPConfig.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\util\CGIParser.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\util\DOMPropertySet.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\util\IPRange.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\util\SPConstants.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\util\TemplateParameters.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\remoting\impl\ddf.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\remoting\impl\ListenerService.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\remoting\impl\SocketListener.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\remoting\impl\TCPListener.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\impl\ChainingAccessControl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\impl\StorageServiceSessionCache.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\impl\XMLAccessControl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\impl\XMLRequestMapper.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\impl\XMLServiceProvider.cpp">
+    <ClCompile Include="..\..\..\shibsp\version.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\attribute\Attribute.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\attribute\BinaryAttribute.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\attribute\ExtensibleAttribute.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttribute.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttribute.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\SimpleAttribute.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\attribute\XMLAttribute.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\attribute</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\binding\impl\XMLProtocolProvider.cpp">
+      <Filter>Source Files\binding\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\AbstractHandler.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionConsumerService.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionLookup.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AttributeCheckerHandler.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingLogoutInitiator.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingSessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\CookieSessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\DiscoveryFeed.cpp">
+      <Filter>Source Files\handler\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ExternalAuthHandler.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\FormSessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\LocalLogoutInitiator.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutHandler.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\MetadataGenerator.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\RemotedHandler.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\SAML1Consumer.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2ArtifactResolution.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Consumer.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Logout.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2LogoutInitiator.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2NameIDMgmt.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2SessionInitiator.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\SAMLDSSessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SecuredHandler.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\SessionHandler.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\SessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\Shib1SessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\StatusHandler.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\TransformSessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\handler\impl\WAYFSessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\handler\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\impl\ChainingAccessControl.cpp">
+      <Filter>Source Files\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\impl\StorageServiceSessionCache.cpp">
+      <Filter>Source Files\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLAccessControl.cpp">
+      <Filter>Source Files\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLRequestMapper.cpp">
+      <Filter>Source Files\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLServiceProvider.cpp">
+      <Filter>Source Files\impl</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\lite\CommonDomainCookie.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\lite</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ddf.cpp">
+      <Filter>Source Files\remoting\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ListenerService.cpp">
+      <Filter>Source Files\remoting\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\SocketListener.cpp">
+      <Filter>Source Files\remoting\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\util\CGIParser.cpp">
+      <Filter>Source Files\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\util\DOMPropertySet.cpp">
+      <Filter>Source Files\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\util\IPRange.cpp">
+      <Filter>Source Files\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\util\SPConstants.cpp">
+      <Filter>Source Files\util</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\util\TemplateParameters.cpp">
+      <Filter>Source Files\util</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\shibsp\lite\SAMLConstants.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\lite</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\version.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2SessionInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAMLDSSessionInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\attribute\SimpleAttribute.cpp">
+      <Filter>Source Files\attribute</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\TCPListener.cpp">
+      <Filter>Source Files\remoting\impl</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
index c243d60..53e268d 100644 (file)
     <ClCompile Include="..\..\..\shibsp\Application.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\Base64AttributeDecoder.cpp">
+    <ClCompile Include="..\..\..\shibsp\ServiceProvider.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerEntityAttributeFunctor.cpp">
+    <ClCompile Include="..\..\..\shibsp\SPConfig.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerEntityMatcherFunctor.cpp">
+    <ClCompile Include="..\..\..\shibsp\version.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterEntityAttributeFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AbstractHandler.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterEntityMatcherFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AnyMatchFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\DummyAttributeFilter.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AndMatchFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NameIDQualifierStringFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerEntityAttributeFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\AssertionAttributeExtractor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerEntityMatcherFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\MetadataAttributeExtractor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerInEntityGroupFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\binding\impl\XMLProtocolProvider.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerRegexFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\AttributeCheckerHandler.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerStringFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\DiscoveryFeed.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterEntityAttributeFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\ExternalAuthHandler.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeMatchesShibMDScopeFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutInitiator.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterEntityMatcherFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\SecuredHandler.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterInEntityGroupFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\impl\XMLSecurityPolicyProvider.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterRegexFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\ServiceProvider.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterStringFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\SPConfig.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeScopeRegexFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\util\CGIParser.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeScopeStringFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\util\DOMPropertySet.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeValueRegexFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\util\IPRange.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeValueStringFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\util\SPConstants.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AuthenticationMethodRegexFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\util\TemplateParameters.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AuthenticationMethodStringFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\security\PKIXTrustEngine.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\binding\impl\ArtifactResolver.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\security\SecurityPolicy.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\AssertionAttributeExtractor.cpp">
+      <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\metadata\DynamicMetadataProvider.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionConsumerService.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\metadata\MetadataExtImpl.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionLookup.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\metadata\MetadataExtSchemaValidators.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AttributeCheckerHandler.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\metadata\MetadataProviderCriteria.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\Attribute.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\remoting\impl\ddf.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeFilter.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\remoting\impl\ListenerService.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\Base64AttributeDecoder.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\remoting\impl\SocketListener.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\BasicFilteringContext.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\remoting\impl\TCPListener.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\BinaryAttribute.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\impl\ChainingAccessControl.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\CGIParser.cpp">
+      <Filter>Source Files\util</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\impl\StorageServiceSessionCache.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\ChainingAccessControl.cpp">
+      <Filter>Source Files\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\impl\TransactionLog.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\ChainingAttributeExtractor.cpp">
+      <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\impl\XMLAccessControl.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\ChainingAttributeFilter.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\impl\XMLRequestMapper.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\ChainingAttributeResolver.cpp">
+      <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\impl\XMLServiceProvider.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingSessionInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\Attribute.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingLogoutInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\BinaryAttribute.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\CookieSessionInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\DOMAttributeDecoder.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ddf.cpp">
+      <Filter>Source Files\remoting\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\ExtensibleAttribute.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\DelegationAttributeExtractor.cpp">
+      <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\KeyInfoAttributeDecoder.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\KeyDescriptorAttributeExtractor.cpp">
+      <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttribute.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\DiscoveryFeed.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttributeDecoder.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\DOMAttributeDecoder.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\NameIDFromScopedAttributeDecoder.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\DOMPropertySet.cpp">
+      <Filter>Source Files\util</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttribute.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\DummyAttributeFilter.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttributeDecoder.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\metadata\DynamicMetadataProvider.cpp">
+      <Filter>Source Files\metadata</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\SimpleAttribute.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\ExtensibleAttribute.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\StringAttributeDecoder.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ExternalAuthHandler.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\XMLAttribute.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\FormSessionInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\XMLAttributeDecoder.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\IPRange.cpp">
+      <Filter>Source Files\util</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\ChainingAttributeExtractor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\KeyInfoAttributeDecoder.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\ChainingAttributeResolver.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ListenerService.cpp">
+      <Filter>Source Files\remoting\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\DelegationAttributeExtractor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LocalLogoutInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\KeyDescriptorAttributeExtractor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutHandler.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\QueryAttributeResolver.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\SimpleAggregationAttributeResolver.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\MatchFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\XMLAttributeExtractor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLServiceProvider.cpp">
+      <Filter>Source Files\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AndMatchFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\MetadataAttributeExtractor.cpp">
+      <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AnyMatchFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\metadata\MetadataExtImpl.cpp">
+      <Filter>Source Files\metadata</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeFilter.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\metadata\MetadataExtSchemaValidators.cpp">
+      <Filter>Source Files\metadata</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerInEntityGroupFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\MetadataGenerator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerRegexFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\metadata\MetadataProviderCriteria.cpp">
+      <Filter>Source Files\metadata</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerStringFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttribute.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterInEntityGroupFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttributeDecoder.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterRegexFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDFromScopedAttributeDecoder.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterStringFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NameIDQualifierStringFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeScopeRegexFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NotMatchFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeScopeStringFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NumberOfAttributeValuesFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeValueRegexFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\OrMatchFunctor.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeValueStringFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\security\PKIXTrustEngine.cpp">
+      <Filter>Source Files\security</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AuthenticationMethodRegexFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\QueryAttributeResolver.cpp">
+      <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AuthenticationMethodStringFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\RemotedHandler.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\BasicFilteringContext.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML1Consumer.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\ChainingAttributeFilter.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2ArtifactResolution.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\MatchFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Consumer.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NotMatchFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Logout.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NumberOfAttributeValuesFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2LogoutInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\OrMatchFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2NameIDMgmt.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\XMLAttributeFilter.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAMLDSSessionInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\binding\impl\ArtifactResolver.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2SessionInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\binding\impl\SOAPClient.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SecuredHandler.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\AbstractHandler.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionHandler.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionConsumerService.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionLookup.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\Shib1SessionInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingLogoutInitiator.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\StatusHandler.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingSessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\TransformSessionInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\CookieSessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\handler\impl\WAYFSessionInitiator.cpp">
+      <Filter>Source Files\handler\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\FormSessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttribute.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\LocalLogoutInitiator.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttributeDecoder.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutHandler.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\SimpleAttribute.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\MetadataGenerator.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\StringAttributeDecoder.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\RemotedHandler.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\XMLAttribute.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML1Consumer.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\XMLAttributeDecoder.cpp">
+      <Filter>Source Files\attribute</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2ArtifactResolution.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\security\SecurityPolicy.cpp">
+      <Filter>Source Files\security</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Consumer.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\SimpleAggregationAttributeResolver.cpp">
+      <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Logout.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\XMLAttributeExtractor.cpp">
+      <Filter>Source Files\attribute\resolver\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2LogoutInitiator.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\binding\impl\SOAPClient.cpp">
+      <Filter>Source Files\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2NameIDMgmt.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\binding\impl\XMLProtocolProvider.cpp">
+      <Filter>Source Files\binding\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2SessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\SocketListener.cpp">
+      <Filter>Source Files\remoting\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\SAMLDSSessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\TCPListener.cpp">
+      <Filter>Source Files\remoting\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionHandler.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\StorageServiceSessionCache.cpp">
+      <Filter>Source Files\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\SPConstants.cpp">
+      <Filter>Source Files\util</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\Shib1SessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\util\TemplateParameters.cpp">
+      <Filter>Source Files\util</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\StatusHandler.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLAccessControl.cpp">
+      <Filter>Source Files\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\TransformSessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLRequestMapper.cpp">
+      <Filter>Source Files\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\handler\impl\WAYFSessionInitiator.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\XMLSecurityPolicyProvider.cpp">
+      <Filter>Source Files\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\version.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\impl\TransactionLog.cpp">
+      <Filter>Source Files\impl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeMatchesShibMDScopeFunctor.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\XMLAttributeFilter.cpp">
+      <Filter>Source Files\attribute\filtering\impl</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>