Tried to fix the issue where we tried to port other classes than the one...

...s in inputdir.

It compiles and most tests run, but end-to-end-tests doesnt run, complains about inputDir. Maybe you can take a look