Moved files around to make more sense with conf.