Merge pull request #1055 from google/restructure

Restructure and update