simplified layout of code and moved name spaces
Merge branch 'master' of https://github.com/atticus88/cas-server-extension-duo