Jenkins fix and pathfinder_society restructure