Refactoring classes into separate files.