Refactored actions into individual files