add some public methods, modified Class and Package name