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.
Can you please change this to a parameter? At the moment cba has a custom importer, and they will have no way to use it.