Removed UserRole package and cleanup

Added DTO's for Account and Role, cleaned up some code. Need to check
tests.