Continue to move classes into their own files and remove whitespace.