Updated folder structure to match current structure.