Move Server attributes to child elements