Restruct command package