Restructured the configuration data.