Rework how we handle various directories