Update namespaces, rename files