Match Meta-Data to File Structure

2021 clean-up: duplicate(s)