Moved mutators into their own file.
Removed unnecessary requires.