Restructed command layout.