clean up config stuff, move into own file and own package.