Added new structure. Beginning copy-paste session.
Finished reorganization, but the diagrams are a mess.