I'll leave that to @nasthagiri on her asset refactoring task which is next up. This one is purely for thumbnails; so, it's less obvious. I think the other ones which manipulate locations in this file need to go or move.