Block: move SIO to the right place

SIO has becomed a series of 3 commits now, what a mess...

Change-Id: I62602f522a5170b2a42efb3de51fa32aabe4e853