Update to new VCS packaging