Working on Packer and tidying up builds