Initial revision of controller implementation classes.
Merge remote-tracking branch 'origin/master'