Reorganize Theme2 Notebooks

Fixes #206