Again, changes on the folder structure.