- Added namespace support
removed XML classes from this file