Refactor Go code to match fs layout changes, #22