move plot files, correct includes in blocking vectorized versions.