Adds some more imports, and fixes esp.program.modules.models import.