Replace Unseen with 'distinct' and tidy file structure