Object architecture adjustment

Per BB2D expert knowledge, added model object as a sub object of the
controller.