Fix up directories