re-designed config dir structure