Feature/add transport structure

I had some reason for putting it there, but I'm sure it is irrelevant after our discussions