Small re-organisation in diagrams

More to come...
Small re-organisation in diagrams (2)