Restructure for cmd and tlm