repackage with namespacing