Updated folder structure