Moved from dpkg_package to generic package