refactor filesystem storage spec