Protobuff refacto

the disruption test do not pass yet (a certain 'throw TODO' in the protobuff), but now it builds :smile: 
2 long lines