Did some refactoring

Signed-off-by: daniel <daniel@paladin234-lm>
Reworked XMl reading for Soape.  

Signed-off-by: daniel <daniel@paladin234-lm>