Reorganize {Get,Set}Option