reorganisation + wrapped response in XML