Moved rio as a subdirectory of transport, added transport in include path
Fixed some capture tests no cleaning test files properly