New image build script, new images, swap build/src directories