Update folder structure for handing