Merged in issue-499 (pull request #334)
https://bitbucket.org/openid/fapi/issues/499/re-structure-fapi2-baseline
https://bitbucket.org/openid/fapi/issues/499/re-structure-fapi2-baseline