Re-organizing subfolder in figures/