split Matrix.h into several files
upgrade matrix sugar. closes #137