Reorganize commanline options