Remove usage of package_dir