break configs out into dir and remove some unused functions