refactor, arrange class name and file name