With 6 years in the Artillery Reserves (Ubique!!) I would agree. Split out armor and artillery, as they are very, very different. Mortars definitely go in the infantry side of things. I would also add under artillery training Air Defence. It, in Canada at least, is also considered an artillery...