ref #2826 improve IF import to PESI (merge) requirements
#3945 move some PESI classes to new packages and minor issues