Remove hole in the middle

There is additional cleanup that will come with the `DirPath` merge but at least the hole-in-the-middle is gone now.
Ha! That's the reason for the hole-in-the-middle, right? Sorry I didn't catch that. I'm going to slice the code in 3 parts callable independently so that they can insert their own logic in the middle.