move first_name and last_name to user model