Reorganize rk30 and rk31