restructuring class files