Change namespaces of some classes