reorganize commands objects