Update to folder structure