- Convert proprietary classes in "xp" package to namespaces