Fs refactor

- fixes #130