[CLEANUP] - Refactored xml domain entity serialisation into separate class to improve separation of concerns and to ease "mockability"