Use pointer-type, move struct definitions out of vectors