Refactoring file storage driver to fsstorage