Clean up + extract sorting by ctor / dtor.
Updating protobuf format.

This breaks the build, thus it just be adjusted soon.