minor changes on folder manipulation