Move traits under respective namespaces.