Move extra-file handling out of UWU

Should be a global process, really.

Change-Id: I17fdfb587a81e8dd366ee6fbc16a5c43debb38ae
Merge "Move extra-file handling out of UWU"