refactoring package to a suitable name