Move actions to the header

Change-Id: I904ae71d4716e3038da6e042031259b4d80d3063