[ymeng] Restruct