Complete diagrams re-organization.