Updated class diagrams and binder includes.
Revert "Updated class diagrams and binder includes."

This reverts commit e84de74180e89ee27a4f85125f9ddf3770c6ca86.