Updated folder structure.