config restructure