more rearranging makefile
update to match new vm_images effort