Get rid of default config class and put it into the normal configs