Move all filesystem access to file-system-util, prepare for mocking