Refactored protocol buffer files