link structuring and filenaming redone