restructure configuration part 2 (#19)