DRY - Restructure prospector
Merge branch 'driskell' into driskell_merge_pr164