Revert "Revert "结构整理""

This reverts commit f76f021f8b930785291bdcd0a756569547f0430c.