More class restructuring & cleanup.