more restructure to get config directives into the right bin