Moved around some files and classes.