Reorganize command spec