Moved some classes around, deleted some unused files/classes.