update all the files by new refactoring