Reorganise a bit.