Finalised templates vs dev setup and updated ANT build