Adapt util-linux script to the new directory structure
Adapt xz script to the new directory structure