diff --git a/ocis-reva/cmd/ocis-reva/main.go b/ocis-reva/cmd/ocis-reva/main.go
index 5c982d178..6f98e4b3c 100644
--- a/ocis-reva/cmd/ocis-reva/main.go
+++ b/ocis-reva/cmd/ocis-reva/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"os"
 
-	"github.com/owncloud/ocis/ocis-revapkg/command"
+	"github.com/owncloud/ocis/ocis-reva/pkg/command"
 )
 
 func main() {
diff --git a/ocis-reva/pkg/command/authbasic.go b/ocis-reva/pkg/command/authbasic.go
index 9e52bf98b..f5d600eb8 100644
--- a/ocis-reva/pkg/command/authbasic.go
+++ b/ocis-reva/pkg/command/authbasic.go
@@ -11,9 +11,9 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/flagset"
-	"github.com/owncloud/ocis/ocis-revapkg/server/debug"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
 )
 
 // AuthBasic is the entrypoint for the auth-basic command.
diff --git a/ocis-reva/pkg/command/authbearer.go b/ocis-reva/pkg/command/authbearer.go
index 23afc1a52..a1807342f 100644
--- a/ocis-reva/pkg/command/authbearer.go
+++ b/ocis-reva/pkg/command/authbearer.go
@@ -11,9 +11,9 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/flagset"
-	"github.com/owncloud/ocis/ocis-revapkg/server/debug"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
 )
 
 // AuthBearer is the entrypoint for the auth-bearer command.
diff --git a/ocis-reva/pkg/command/drivers.go b/ocis-reva/pkg/command/drivers.go
index cfd71a256..bb76ff0b7 100644
--- a/ocis-reva/pkg/command/drivers.go
+++ b/ocis-reva/pkg/command/drivers.go
@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 func drivers(cfg *config.Config) map[string]interface{} {
diff --git a/ocis-reva/pkg/command/frontend.go b/ocis-reva/pkg/command/frontend.go
index 3cd45027f..bba097f35 100644
--- a/ocis-reva/pkg/command/frontend.go
+++ b/ocis-reva/pkg/command/frontend.go
@@ -13,9 +13,9 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/flagset"
-	"github.com/owncloud/ocis/ocis-revapkg/server/debug"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
 )
 
 // Frontend is the entrypoint for the frontend command.
diff --git a/ocis-reva/pkg/command/gateway.go b/ocis-reva/pkg/command/gateway.go
index 2ad00527b..513367dae 100644
--- a/ocis-reva/pkg/command/gateway.go
+++ b/ocis-reva/pkg/command/gateway.go
@@ -12,10 +12,10 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/flagset"
-	"github.com/owncloud/ocis/ocis-revapkg/server/debug"
-	"github.com/owncloud/ocis/ocis-revapkg/service/external"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
+	"github.com/owncloud/ocis/ocis-reva/pkg/service/external"
 )
 
 // Gateway is the entrypoint for the gateway command.
diff --git a/ocis-reva/pkg/command/health.go b/ocis-reva/pkg/command/health.go
index 72c359d81..12217ce6b 100644
--- a/ocis-reva/pkg/command/health.go
+++ b/ocis-reva/pkg/command/health.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/flagset"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
 )
 
 // Health is the entrypoint for the health command.
diff --git a/ocis-reva/pkg/command/root.go b/ocis-reva/pkg/command/root.go
index 406c74da1..1b1fd5b86 100644
--- a/ocis-reva/pkg/command/root.go
+++ b/ocis-reva/pkg/command/root.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/micro/cli/v2"
 	"github.com/owncloud/ocis-pkg/v2/log"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/flagset"
-	"github.com/owncloud/ocis/ocis-revapkg/version"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/ocis-reva/pkg/version"
 	"github.com/spf13/viper"
 )
 
diff --git a/ocis-reva/pkg/command/sharing.go b/ocis-reva/pkg/command/sharing.go
index 9264f7636..101542b54 100644
--- a/ocis-reva/pkg/command/sharing.go
+++ b/ocis-reva/pkg/command/sharing.go
@@ -11,9 +11,9 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/flagset"
-	"github.com/owncloud/ocis/ocis-revapkg/server/debug"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
 )
 
 // Sharing is the entrypoint for the sharing command.
diff --git a/ocis-reva/pkg/command/storageeos.go b/ocis-reva/pkg/command/storageeos.go
index c2c29e8c8..6a7651dea 100644
--- a/ocis-reva/pkg/command/storageeos.go
+++ b/ocis-reva/pkg/command/storageeos.go
@@ -11,9 +11,9 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/flagset"
-	"github.com/owncloud/ocis/ocis-revapkg/server/debug"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
 )
 
 // StorageEOS is the entrypoint for the storage-eos command.
diff --git a/ocis-reva/pkg/command/storageeosdata.go b/ocis-reva/pkg/command/storageeosdata.go
index 2966330ea..6db4076dc 100644
--- a/ocis-reva/pkg/command/storageeosdata.go
+++ b/ocis-reva/pkg/command/storageeosdata.go
@@ -11,9 +11,9 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/flagset"
-	"github.com/owncloud/ocis/ocis-revapkg/server/debug"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
 )
 
 // StorageEOSData is the entrypoint for the storage-oc-data command.
diff --git a/ocis-reva/pkg/command/storagehome.go b/ocis-reva/pkg/command/storagehome.go
index 3187b1733..939b4e5e6 100644
--- a/ocis-reva/pkg/command/storagehome.go
+++ b/ocis-reva/pkg/command/storagehome.go
@@ -11,9 +11,9 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/flagset"
-	"github.com/owncloud/ocis/ocis-revapkg/server/debug"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
 )
 
 // StorageHome is the entrypoint for the storage-home command.
diff --git a/ocis-reva/pkg/command/storagehomedata.go b/ocis-reva/pkg/command/storagehomedata.go
index 6737c34f4..2d8eb8049 100644
--- a/ocis-reva/pkg/command/storagehomedata.go
+++ b/ocis-reva/pkg/command/storagehomedata.go
@@ -11,9 +11,9 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/flagset"
-	"github.com/owncloud/ocis/ocis-revapkg/server/debug"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
 )
 
 // StorageHomeData is the entrypoint for the storage-home-data command.
diff --git a/ocis-reva/pkg/command/storageoc.go b/ocis-reva/pkg/command/storageoc.go
index e79bd3f72..4a05a6663 100644
--- a/ocis-reva/pkg/command/storageoc.go
+++ b/ocis-reva/pkg/command/storageoc.go
@@ -11,9 +11,9 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/flagset"
-	"github.com/owncloud/ocis/ocis-revapkg/server/debug"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
 )
 
 // StorageOC is the entrypoint for the storage-oc command.
diff --git a/ocis-reva/pkg/command/storageocdata.go b/ocis-reva/pkg/command/storageocdata.go
index 672b037d6..7ab64334f 100644
--- a/ocis-reva/pkg/command/storageocdata.go
+++ b/ocis-reva/pkg/command/storageocdata.go
@@ -11,9 +11,9 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/flagset"
-	"github.com/owncloud/ocis/ocis-revapkg/server/debug"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
 )
 
 // StorageOCData is the entrypoint for the storage-oc-data command.
diff --git a/ocis-reva/pkg/command/storagepubliclink.go b/ocis-reva/pkg/command/storagepubliclink.go
index 413ac4e13..b8eb41c2a 100644
--- a/ocis-reva/pkg/command/storagepubliclink.go
+++ b/ocis-reva/pkg/command/storagepubliclink.go
@@ -11,9 +11,9 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/flagset"
-	"github.com/owncloud/ocis/ocis-revapkg/server/debug"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
 )
 
 // StoragePublicLink is the entrypoint for the reva-storage-public-link command.
diff --git a/ocis-reva/pkg/command/storageroot.go b/ocis-reva/pkg/command/storageroot.go
index 369e6ec96..8b6b808ec 100644
--- a/ocis-reva/pkg/command/storageroot.go
+++ b/ocis-reva/pkg/command/storageroot.go
@@ -11,9 +11,9 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/flagset"
-	"github.com/owncloud/ocis/ocis-revapkg/server/debug"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
 )
 
 // StorageRoot is the entrypoint for the storage-root command.
diff --git a/ocis-reva/pkg/command/users.go b/ocis-reva/pkg/command/users.go
index 4abef6ba3..6b7f701b8 100644
--- a/ocis-reva/pkg/command/users.go
+++ b/ocis-reva/pkg/command/users.go
@@ -11,9 +11,9 @@ import (
 	"github.com/gofrs/uuid"
 	"github.com/micro/cli/v2"
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/flagset"
-	"github.com/owncloud/ocis/ocis-revapkg/server/debug"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/flagset"
+	"github.com/owncloud/ocis/ocis-reva/pkg/server/debug"
 )
 
 // Users is the entrypoint for the sharing command.
diff --git a/ocis-reva/pkg/flagset/authbasic.go b/ocis-reva/pkg/flagset/authbasic.go
index fcc2fb433..d32c29790 100644
--- a/ocis-reva/pkg/flagset/authbasic.go
+++ b/ocis-reva/pkg/flagset/authbasic.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // AuthBasicWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/authbearer.go b/ocis-reva/pkg/flagset/authbearer.go
index 4da501dd9..65c2bb33d 100644
--- a/ocis-reva/pkg/flagset/authbearer.go
+++ b/ocis-reva/pkg/flagset/authbearer.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // AuthBearerWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/debug.go b/ocis-reva/pkg/flagset/debug.go
index a3e92f73b..7b29a9698 100644
--- a/ocis-reva/pkg/flagset/debug.go
+++ b/ocis-reva/pkg/flagset/debug.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // DebugWithConfig applies common debug config cfg to the flagset
diff --git a/ocis-reva/pkg/flagset/drivereos.go b/ocis-reva/pkg/flagset/drivereos.go
index b07f60e98..c064a0a19 100644
--- a/ocis-reva/pkg/flagset/drivereos.go
+++ b/ocis-reva/pkg/flagset/drivereos.go
@@ -4,7 +4,7 @@ import (
 	"os"
 
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // DriverEOSWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/driverlocal.go b/ocis-reva/pkg/flagset/driverlocal.go
index a38125b7e..9f174687c 100644
--- a/ocis-reva/pkg/flagset/driverlocal.go
+++ b/ocis-reva/pkg/flagset/driverlocal.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // DriverLocalWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/driverocis.go b/ocis-reva/pkg/flagset/driverocis.go
index 569a43a77..17363370c 100644
--- a/ocis-reva/pkg/flagset/driverocis.go
+++ b/ocis-reva/pkg/flagset/driverocis.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // DriverOCISWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/driverowncloud.go b/ocis-reva/pkg/flagset/driverowncloud.go
index d8c5f88db..1cb56cdea 100644
--- a/ocis-reva/pkg/flagset/driverowncloud.go
+++ b/ocis-reva/pkg/flagset/driverowncloud.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // DriverOwnCloudWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/frontend.go b/ocis-reva/pkg/flagset/frontend.go
index 1e747154d..981a4788a 100644
--- a/ocis-reva/pkg/flagset/frontend.go
+++ b/ocis-reva/pkg/flagset/frontend.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // FrontendWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/gateway.go b/ocis-reva/pkg/flagset/gateway.go
index 30aa80864..5c5eb1d21 100644
--- a/ocis-reva/pkg/flagset/gateway.go
+++ b/ocis-reva/pkg/flagset/gateway.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // GatewayWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/health.go b/ocis-reva/pkg/flagset/health.go
index b42713460..ca462d618 100644
--- a/ocis-reva/pkg/flagset/health.go
+++ b/ocis-reva/pkg/flagset/health.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // HealthWithConfig applies cfg to the health flagset
diff --git a/ocis-reva/pkg/flagset/ldap.go b/ocis-reva/pkg/flagset/ldap.go
index 2c16059c7..11bfb996c 100644
--- a/ocis-reva/pkg/flagset/ldap.go
+++ b/ocis-reva/pkg/flagset/ldap.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // LDAPWithConfig applies LDAP cfg to the flagset
diff --git a/ocis-reva/pkg/flagset/root.go b/ocis-reva/pkg/flagset/root.go
index 2c84119df..3871571d8 100644
--- a/ocis-reva/pkg/flagset/root.go
+++ b/ocis-reva/pkg/flagset/root.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // RootWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/secret.go b/ocis-reva/pkg/flagset/secret.go
index daaa3c45f..76c886cc1 100644
--- a/ocis-reva/pkg/flagset/secret.go
+++ b/ocis-reva/pkg/flagset/secret.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // SecretWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/sharing.go b/ocis-reva/pkg/flagset/sharing.go
index 9b1f9db01..8000254eb 100644
--- a/ocis-reva/pkg/flagset/sharing.go
+++ b/ocis-reva/pkg/flagset/sharing.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // SharingWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/storageeos.go b/ocis-reva/pkg/flagset/storageeos.go
index fc7a784cc..256cf7bfb 100644
--- a/ocis-reva/pkg/flagset/storageeos.go
+++ b/ocis-reva/pkg/flagset/storageeos.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // StorageEOSWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/storageeosdata.go b/ocis-reva/pkg/flagset/storageeosdata.go
index 43b902159..e0b355b85 100644
--- a/ocis-reva/pkg/flagset/storageeosdata.go
+++ b/ocis-reva/pkg/flagset/storageeosdata.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // StorageEOSDataWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/storagehome.go b/ocis-reva/pkg/flagset/storagehome.go
index c361cee21..5ba95374d 100644
--- a/ocis-reva/pkg/flagset/storagehome.go
+++ b/ocis-reva/pkg/flagset/storagehome.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // StorageHomeWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/storagehomedata.go b/ocis-reva/pkg/flagset/storagehomedata.go
index 7b187aed5..28755c18f 100644
--- a/ocis-reva/pkg/flagset/storagehomedata.go
+++ b/ocis-reva/pkg/flagset/storagehomedata.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // StorageHomeDataWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/storageoc.go b/ocis-reva/pkg/flagset/storageoc.go
index 339b719ad..04389d2e4 100644
--- a/ocis-reva/pkg/flagset/storageoc.go
+++ b/ocis-reva/pkg/flagset/storageoc.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // StorageOCWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/storageocdata.go b/ocis-reva/pkg/flagset/storageocdata.go
index 81e893e81..e89b563ba 100644
--- a/ocis-reva/pkg/flagset/storageocdata.go
+++ b/ocis-reva/pkg/flagset/storageocdata.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // StorageOCDataWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/storagepubliclink.go b/ocis-reva/pkg/flagset/storagepubliclink.go
index 227c64b00..d58121aa5 100644
--- a/ocis-reva/pkg/flagset/storagepubliclink.go
+++ b/ocis-reva/pkg/flagset/storagepubliclink.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // StoragePublicLink applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/storageroot.go b/ocis-reva/pkg/flagset/storageroot.go
index b7cd3f597..46fd261d5 100644
--- a/ocis-reva/pkg/flagset/storageroot.go
+++ b/ocis-reva/pkg/flagset/storageroot.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // StorageRootWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/tracing.go b/ocis-reva/pkg/flagset/tracing.go
index d548e2c04..a1420ab31 100644
--- a/ocis-reva/pkg/flagset/tracing.go
+++ b/ocis-reva/pkg/flagset/tracing.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // TracingWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/flagset/users.go b/ocis-reva/pkg/flagset/users.go
index 25d709232..b386d5fbe 100644
--- a/ocis-reva/pkg/flagset/users.go
+++ b/ocis-reva/pkg/flagset/users.go
@@ -2,7 +2,7 @@ package flagset
 
 import (
 	"github.com/micro/cli/v2"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // UsersWithConfig applies cfg to the root flagset
diff --git a/ocis-reva/pkg/server/debug/option.go b/ocis-reva/pkg/server/debug/option.go
index 1ba9dbcf0..b7d0eb697 100644
--- a/ocis-reva/pkg/server/debug/option.go
+++ b/ocis-reva/pkg/server/debug/option.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/owncloud/ocis-pkg/v2/log"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
 )
 
 // Option defines a single option function.
diff --git a/ocis-reva/pkg/server/debug/server.go b/ocis-reva/pkg/server/debug/server.go
index 91ba08d5c..ad6e7824c 100644
--- a/ocis-reva/pkg/server/debug/server.go
+++ b/ocis-reva/pkg/server/debug/server.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/owncloud/ocis-pkg/v2/service/debug"
-	"github.com/owncloud/ocis/ocis-revapkg/config"
-	"github.com/owncloud/ocis/ocis-revapkg/version"
+	"github.com/owncloud/ocis/ocis-reva/pkg/config"
+	"github.com/owncloud/ocis/ocis-reva/pkg/version"
 )
 
 // Server initializes the debug service and server.
diff --git a/ocis/go.mod b/ocis/go.mod
index 272741d07..1e7186bf6 100644
--- a/ocis/go.mod
+++ b/ocis/go.mod
@@ -26,6 +26,7 @@ require (
 	github.com/owncloud/ocis/ocis-reva v0.0.0-00010101000000-000000000000
 	github.com/owncloud/ocis/ocs v0.0.0-00010101000000-000000000000
 	github.com/owncloud/ocis/proxy v0.0.0-00010101000000-000000000000
+	github.com/owncloud/ocis/ocis-phoenix v0.0.0-00010101000000-000000000000
 	github.com/owncloud/ocis/settings v0.0.0-20200914113019-7c3cfd3f8756
 	github.com/owncloud/ocis/store v0.0.0-20200914113019-7c3cfd3f8756
 	github.com/owncloud/ocis/thumbnails v0.1.6
@@ -38,10 +39,11 @@ require (
 replace (
 	github.com/gomodule/redigo => github.com/gomodule/redigo v1.8.2
 	github.com/owncloud/ocis/accounts => ../accounts
-	github.com/owncloud/ocis/ocis-reva => ../ocis-reva
 	github.com/owncloud/ocis/glauth => ../glauth
 	github.com/owncloud/ocis/konnectd => ../konnectd
 	github.com/owncloud/ocis/ocis-pkg => ../ocis-pkg
+	github.com/owncloud/ocis/ocis-reva => ../ocis-reva
+	github.com/owncloud/ocis/ocis-phoenix => ../ocis-phoenix
 	github.com/owncloud/ocis/ocs => ../ocs
 	github.com/owncloud/ocis/proxy => ../proxy
 	github.com/owncloud/ocis/settings => ../settings
diff --git a/ocis/go.sum b/ocis/go.sum
index e31c4c614..43629104d 100644
--- a/ocis/go.sum
+++ b/ocis/go.sum
@@ -689,6 +689,7 @@ github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3 h1:GV+pQPG/EUUbkh47niozDcADz6go/dUwhVzdUQHIVRw=
 github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
diff --git a/ocis/pkg/config/config.go b/ocis/pkg/config/config.go
index 1cb9a2438..06c0778d2 100644
--- a/ocis/pkg/config/config.go
+++ b/ocis/pkg/config/config.go
@@ -8,7 +8,7 @@ import (
 	hello "github.com/owncloud/ocis-hello/pkg/config"
 	konnectd "github.com/owncloud/ocis/konnectd/pkg/config"
 	ocs "github.com/owncloud/ocis/ocs/pkg/config"
-	phoenix "github.com/owncloud/ocis-phoenix/pkg/config"
+	phoenix "github.com/owncloud/ocis/ocis-phoenix/pkg/config"
 	proxy "github.com/owncloud/ocis/proxy/pkg/config"
 	reva "github.com/owncloud/ocis/ocis-reva/pkg/config"
 	settings "github.com/owncloud/ocis/settings/pkg/config"