Simplify FileSystem API
Remove workspace from repo