Cleaned Up Code
Various Changes! Didn't delete anything or create any new classes, just moved them!