File consolidation, some code cleanup

Consolidated all class files into a single file