Reorganize command structure.