Refactor armor traits into ArmorCore