Added dependency to Smatrix (header files). Removed the dependency to Smatrix (library)  since it is only a dictionary and Smatrix is all inlined.