Removed old config stuff.
Renamed config2 namespace to config, removed more old config stuff.