further beautify the class name and file names