Move inner classes up to namespace level
Merge branch 'master' of https://github.com/cammsaul/crow-security