Finished up the config separation