Begin reorganizing commands