Add config files. And clean up better.