Reorganized disks and fixes