Move mail and popin template in Rbs_Common theme