refactored actions package