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.
Got it. I just fixed the issue and re-structured things. Next thing I'm going to do is to write a bunch of tests for this logic.