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

Update for directory shuffle