Rename classes and separate files