Clean up of classes to separate files.