Change in osmo-bsc[2022q2]: Rearrange ctrl interface code