removed protocol buffers, made everything conform to class naming convention