Reorganise APIs