Really REALLY use the right dirs (jeez)