Revert "Renamed upload to media_storage"

This reverts commit fc94e0e6ec3a91076a75b88db4fd1540d3e9aca6.