Update for directory shuffle
Merge pull request #7 from pcwalton/directory-shuffle

Update for directory shuffle