Restructure the base plugin/package namespace