Add a "file upload" button to each folder in the file manager (see #3432)
Move the "protect folder" settings to the edit screen (see #5376)