Refactoring of namespaces etc.