Refactor for building distro zip
Refactor for building distro zip