Updated folder structure to final