remove sample keys
re-order plugin includes
refactor to make use of PathFinder