Refactoring/switch to filesystem abstraction #30
cs-util wants to merge
refactoring/switch-to-filesystem-abstraction
into master
refactoring/switch-to-filesystem-abstraction
into master