Fixes after adding loadImmToReg package. LoadImmToReg abstract classes
now extend the proper classes.
Merge remote-tracking branch 'origin/master' into kevins_branch
Fixed merge conflicts from kevins_branch
fixed broken import