Refactor User, and Feeds into their own services