Refactored actions (again...)
Moved action definitions to separate files.