Reorganize chef handler options