Revert renaming for virtual-methods and fix tarball structure