Whoops, cleaned up DirectoryNavigator a bit more