Included SimpleVector in the correct place, added a matrix file to use default