moved tests to main directory
added matrix struct