Revised file structure to one class per file.