Refactoring

XP compatibility methods and object moved to dedicated namespace, as
extension methods.