Reorganize class file