extracting classes to separate files