restructure configuration (#19)