Move protobuf-based entity to separate package