re-orgnize class in file