restructured so vectors are types
swap files