Improve the folder manipulation