Collapsed common functions from i1 and i2 into base package

Moved nearly all of the i2 functions into the base class
Moved the same i1 functions as well
Cleaned up a few print_log commands
Corrected all package selections after callbacks to main