Move old macro figures (old filtering), add nosubs notebooks, data, and
figures
Recompute substitutions with new filtering, update substitutions
notebook BUT NO FIGURES