restructured commands