Changed class names and added a namespace