Follow CMs external/chromium_org and organize better