Convert storage interface to factory.
Merge pull request #52 from leftclickben/ConvertStorageInterfaceToFactory

Convert storage interface to factory.