Update package name and namespacing