Complete restructure of command definitions