Reorganize the config source code, Add sections