Restructured managers as listeners to events
Merge remote-tracking branch 'origin/master'