refactor the folder