Basic structure for the new armor/damage types is in place.

Moved some things to the API