Updated to newer VCS PKGDIR recommendations