Rename package_dir to package_src_dir
Push handling of package creation further into PackageBuilder