User and User service updated to comply with new structure
class merge