Restructure armor branch in line with main branch and add ant support

bug also fixed in the tinker chunk provider as done in the main branch