Reorganise functions.