upgrade modified packages from git

APY-142 : Rewrite packiging code

Previous commit was wrong.