User-Content-File works together with new file structure