Refactoring to make use of changes on Shiro
Inclusion of authentication with OTPs