Undoing bunch of commits

Removal of support for iBOB and BEE2 rolled back for the moment.
Unfortunately can't make certain bug fixes as files have changed location.