Move a bunch of struct definitions out of the vectors that contain them