Reorganized the configuration, now makes more sense.