config file reorg for easier readability