Rename working notebooks, and clean up
More data cleanup and figures moved around
Rename and clean up figures