refactor option & client.fs