Update for directory shuffle

r? @metajack