Cleans file-naming and adds links for packages part 2