Lots of fixing derps(mostly my own) eg. standardizing a lot of the
labeling, removing prototype class files that we redone etc.