SDD r2 and Various Diagram changes

Still to do: Millions of other Diagram changes.

I've also started to organize the program projects.