Refactored some names and the locations of some classes.