refactor name folder and file