Update disks, tidy into folders, add monsters