PCT-671: move structs to proto