Internal refactor to move actions into their own classes