Split package2 job

@pitr-ch - hopefully this time notification will be sent
Would be nice to split it more but local variables passing must be discussed first. However one TODO is removed at least...