XML regactoring

Signed-off-by: Nicu <nicubalti@gmail.com>