new file uploads structure, closes #38