Refactor package imports [ci skip]