Change namespace and remove getters and setters