change some classes to namespace