Tunnel/ directory is now tidy