Merge pull request #34 from sai-sriram-mahavadi/proto

Merging sw-refactor into proto back.