Fix dir locations