Ok, I have mae combat training in to a special kind of module to study. Check out the document for all the details. It should give everyone a level of combat training as standard. It should also give you the opprotunity to specialise in a particular area. I might add on the odd sub-module such as ‘Explosives’ to cover that aspect.
As for the levels, replacing ‘Untrained’ with ‘Basic’ is fine. It will be just a level of knowledge equal to basic training. In terms of RP, you’d spend the first year at the academy covering all the basic knowledge of all the modules, and then the next couple of years you’d select modules to learn more about. A bit like some university courses today.