Rearrange packages of command classes