Revert "[wip] Improve/remove fs"
Merge pull request #69 from Automattic/revert-66-improve/remove-fs

Revert "[wip] Improve/remove fs"