Refactored the storage service to move the provider to it's own bundle.