Revamping the directory runner code.