Adding new methods and restructuring the packages