restructure configuration