Refactor Import package with test