refactor and rename package import