Reworking loading of controllers and models