Reorg org config, commented several changes