splits classes into separate files and corrects naming conventions