Split matrix and vector into separate modules
Break things that used to work
Remove a swap file
Small changes