Moved class in it's own file and added a namespace