Repackage some of IFarming and remove unused classes