Because (almost) everything is done in handlers now, merge the action files.