Cleanup file heir so it's less confusing.