Merge pull request #132 from CyberCRI/refactor-tools-out-of-actions

Refactor tools out of actions