Reverse output directory hierarchy
Fix probe map construction, cleanup
Add cumulative check