restructure the config
restructure the config