Major changes to folder structures
Major overhaul