16basic_figure

This is the last step to get rid of the original code.