Huge amount of code cleanup and housekeeping. Standardized multiple classes, improved class names, purged unused classes