diff --git a/cmd/revad/runtime/loader.go b/cmd/revad/runtime/loader.go
index 21175fbde12..bdaa29b2a9a 100644
--- a/cmd/revad/runtime/loader.go
+++ b/cmd/revad/runtime/loader.go
@@ -29,6 +29,7 @@ import (
 	_ "github.com/cs3org/reva/internal/http/services/loader"
 	_ "github.com/cs3org/reva/pkg/auth/manager/loader"
 	_ "github.com/cs3org/reva/pkg/auth/registry/loader"
+	_ "github.com/cs3org/reva/pkg/cbox/loader"
 	_ "github.com/cs3org/reva/pkg/metrics/driver/loader"
 	_ "github.com/cs3org/reva/pkg/ocm/invite/manager/loader"
 	_ "github.com/cs3org/reva/pkg/ocm/provider/authorizer/loader"
diff --git a/pkg/cbox/loader/loader.go b/pkg/cbox/loader/loader.go
new file mode 100644
index 00000000000..17b84eaa365
--- /dev/null
+++ b/pkg/cbox/loader/loader.go
@@ -0,0 +1,25 @@
+// Copyright 2018-2020 CERN
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// In applying this license, CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+package loader
+
+import (
+	// Load cbox specific drivers.
+	_ "github.com/cs3org/reva/pkg/cbox/share/sql"
+	_ "github.com/cs3org/reva/pkg/cbox/user/rest"
+)
diff --git a/pkg/share/manager/sql/conversions.go b/pkg/cbox/share/sql/conversions.go
similarity index 100%
rename from pkg/share/manager/sql/conversions.go
rename to pkg/cbox/share/sql/conversions.go
diff --git a/pkg/share/manager/sql/sql.go b/pkg/cbox/share/sql/sql.go
similarity index 100%
rename from pkg/share/manager/sql/sql.go
rename to pkg/cbox/share/sql/sql.go
diff --git a/pkg/user/manager/rest/cache.go b/pkg/cbox/user/rest/cache.go
similarity index 100%
rename from pkg/user/manager/rest/cache.go
rename to pkg/cbox/user/rest/cache.go
diff --git a/pkg/user/manager/rest/rest.go b/pkg/cbox/user/rest/rest.go
similarity index 100%
rename from pkg/user/manager/rest/rest.go
rename to pkg/cbox/user/rest/rest.go
diff --git a/pkg/share/manager/loader/loader.go b/pkg/share/manager/loader/loader.go
index 3b7215f2c08..58e33603eb6 100644
--- a/pkg/share/manager/loader/loader.go
+++ b/pkg/share/manager/loader/loader.go
@@ -22,6 +22,5 @@ import (
 	// Load core share manager drivers.
 	_ "github.com/cs3org/reva/pkg/share/manager/json"
 	_ "github.com/cs3org/reva/pkg/share/manager/memory"
-	_ "github.com/cs3org/reva/pkg/share/manager/sql"
 	// Add your own here
 )
diff --git a/pkg/user/manager/loader/loader.go b/pkg/user/manager/loader/loader.go
index a31cc5274c7..b065010602d 100644
--- a/pkg/user/manager/loader/loader.go
+++ b/pkg/user/manager/loader/loader.go
@@ -23,6 +23,5 @@ import (
 	_ "github.com/cs3org/reva/pkg/user/manager/demo"
 	_ "github.com/cs3org/reva/pkg/user/manager/json"
 	_ "github.com/cs3org/reva/pkg/user/manager/ldap"
-	_ "github.com/cs3org/reva/pkg/user/manager/rest"
 	// Add your own here
 )