MNT: Refactor more or less complete.  Caswell wants to continue refactoring, but the DEMO_plot1D.py and DEMO_plot2Dstack.py work now.