renamed classes and a namespace