Clean some things up: move image-builder