Changes to the folder structure