Fix model-to-module-location assumption.  Still some work to be done on this.