Updating queries to be more organized
updating `UserEntity`
Updating `AnswerService` to use `AnswerQueries`