Move to OneInputStub and TwoInputStub as traits instead of Map4sStub etc
Add new DataStreamNG as interim solution

Neede before everything is ported to the new way of doing things
Rename NGStubParameters to StubParametersNG