Better PATH to avoid duplicate dirs