Updated folder structure for multiple directories