restructure config