Initial conversion to namespaces