Now make_upload_directory() is used, avoiding dependencies to