giza: move building of images and options to the branch_source directory
giza: use new branch getters