Massive update to the folder structure