Refactored to use SF fs
Fixed up FS adapter
Fixture generation