Put the class in in own package