Refactor package

Package name updated