Extracting classes to separate files