Reorg options but keep ```option.path``` and ```option.base``` in a certain way, not sure if it can be reorg as the others