Split off package() part