Work

- Rearranged matrix structs a bit