Merge "Refactor to make file sys more like class inheritance"