fix old namespaces, make config classes static