move config to more consistent place