Refactory namespaces.