Combine Storage and Remove Storage

Recently a storage section was added to ES's settings which many of us appreciate. Why not combine the storage settings with the remote settings? The remote settings as of right now uses tabs to separate the different sections (2 as of now). The combined settings could be called "Storage" with the first tab having the local storage stuff, the general tab could be renamed "Remote Storage" so that it's obvious what it is. And the amazon S3 would keep it's name as it is now.

I figure this would not only make the settings feel a little more simple, but would be putting like items next to each other.