relay: use new pacakge structure