major changes to the folder structure