restructure the config