Rename UPLOAD_FOLDER to STORAGE_DIR to make it more obvious what its role is