reorg to be oppropriate for symlinks