Move commands one level down
Work on descriptors