Rename several packages to saner namespacing