move from .* package import back to explicit entries