Move actions from MultipleChoice into main