pathfinder: restructure