Change the directory walker to a more sane implementation