Refactored actions into separate files