Corrected dir locations