Simplify pathwalk and re-arrange to accomodate
split dependencies