Organize actions

Change-Id: Ifeb2d7caae0ff960512b294cb48235b629d70f70