Reorganise theorem applier feature