vectors as tuple-structs
moved matrices to tuple structs