Refactor to use separate actions from actions/ directory