Reorganize class files