*: proto refactoring
Merge pull request #1287 from coreos/refactor

*: proto refactoring