Moved the component map into the controller package as a step towards genericizing it beyond just ModelObjects