Merge branch 'master' of D:\项目code\Google\Livable with conflicts.
Revert "Merge branch 'master' of D:\项目code\Google\Livable with conflicts."

This reverts commit 8df0a60d6ace769ed2603ea457f4311ae8fcc745.
将代码重新构架