fix (Config): reorganize configuration entries.