Moves User and Payment into their own module.