At least preliminarily move all import functionality into the
appropriate package