Structural update of Control Explorer based on my experience
Merge pull request #932 from mfalesni/control_structure_update

Structural update of some Control Explorer objects