Better return message
Renamed for more consistency
More refactoring and first test to see how protobuffers work
better build