Refactoring, code clean-up, added more users endpoints
Added file missed from source control