Rearrange protocol declarations