Re-Format Countermeasures

[mrdrewkeller]

In order to better view and maintain countermeasures we will implement the following changes.

• Organize by actor
• Split out justification to separate line
• split out mitigations to a separate line
• Make mitigations reusable and stored in a separate file