Massive switch from Scalaxy/Components to /Streams
Fixed code for latest Scalaxy/Streams, matrix test now passes!!!