extract SAML and AWS into modules