Update for directory reshuffle

r? @metajack