refactor the package name to avoid any possible namig conflicts