Tunnel refactoring

Relates to #496 (closed).

Please see individual commits. This refactoring only moves files around, doesn't change anything else.