Move 'require-package calls to the related setup code