Reorg class files