Add apparatus figure

Not sure how I lost track of this
Fix beamsplitter reference
Reorganize
Many fixes