Clean up PortableStorage
Add FileStorage