Merge branch 'master' into config-doc-descriptions

ocis/pkg/command/app-provider.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/app-provider/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/app-provider/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func AppProviderCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.AppProvider.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.AppProvider.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/app-registry.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/app-registry/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/app-registry/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func AppRegistryCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.AppRegistry.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.AppRegistry.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/audit.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/audit/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/audit/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func AuditCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Audit.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Audit.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/auth-basic.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/auth-basic/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func AuthBasicCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.AuthBasic.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.AuthBasic.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/auth-bearer.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/auth-bearer/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func AuthBearerCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.AuthBearer.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.AuthBearer.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/auth-machine.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/auth-machine/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func AuthMachineCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.AuthMachine.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.AuthMachine.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/frontend.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/frontend/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/frontend/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func FrontendCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Frontend.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Frontend.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/gateway.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/gateway/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/gateway/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func GatewayCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Gateway.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Gateway.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/graph-explorer.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func GraphExplorerCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.GraphExplorer.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.GraphExplorer.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/graph.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/graph/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/graph/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func GraphCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Graph.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Graph.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/groups.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/groups/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/groups/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func GroupsCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Groups.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Groups.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/idm.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/idm/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/idm/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func IDMCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.IDM.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.IDM.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/idp.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/idp/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/idp/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func IDPCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.IDP.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.IDP.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/list.go

@@ -15,7 +15,7 @@ import (
 func ListCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     "list",
-		Usage:    "list oCIS extensions running in the runtime (supervised mode)",
+		Usage:    "list oCIS services running in the runtime (supervised mode)",
 		Category: "runtime",
 		Flags: []cli.Flag{
 			&cli.StringFlag{

ocis/pkg/command/migrate.go

@@ -11,10 +11,12 @@ import (
 	publicregistry "github.com/cs3org/reva/v2/pkg/publicshare/manager/registry"
 	"github.com/cs3org/reva/v2/pkg/share"
 	"github.com/cs3org/reva/v2/pkg/share/manager/registry"
-	sharing "github.com/owncloud/ocis/v2/extensions/sharing/pkg/config"
+
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	sharing "github.com/owncloud/ocis/v2/services/sharing/pkg/config"
+	sharingparser "github.com/owncloud/ocis/v2/services/sharing/pkg/config/parser"
 	"github.com/rs/zerolog"
 	"github.com/urfave/cli/v2"
 )
@@ -26,10 +28,18 @@ func Migrate(cfg *config.Config) *cli.Command {
 		Usage:    "migrate data from an existing to another instance",
 		Category: "migration",
 		Before: func(c *cli.Context) error {
+			// Parse base config
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)
 				return err
 			}
+
+			// Parse sharing config
+			cfg.Sharing.Commons = cfg.Commons
+			if err := sharingparser.ParseConfig(cfg.Sharing); err != nil {
+				fmt.Printf("%v", err)
+				return err
+			}
 			return nil
 		},
 		Subcommands: []*cli.Command{
@@ -59,14 +69,6 @@ func MigrateShares(cfg *config.Config) *cli.Command {
 				Usage: "Share manager to import the data into",
 			},
 		},
-		Before: func(c *cli.Context) error {
-			err := parser.ParseConfig(cfg, true)
-			if err != nil {
-				fmt.Printf("%v", err)
-				os.Exit(1)
-			}
-			return nil
-		},
 		Action: func(c *cli.Context) error {
 			log := zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr}).With().Timestamp().Logger()
 			ctx := log.WithContext(context.Background())
@@ -152,14 +154,6 @@ func MigratePublicShares(cfg *config.Config) *cli.Command {
 				Usage: "Public share manager to import the data into",
 			},
 		},
-		Before: func(c *cli.Context) error {
-			err := parser.ParseConfig(cfg, true)
-			if err != nil {
-				fmt.Printf("%v", err)
-				os.Exit(1)
-			}
-			return err
-		},
 		Action: func(c *cli.Context) error {
 			log := zerolog.New(zerolog.ConsoleWriter{Out: os.Stderr}).With().Timestamp().Logger()
 			ctx := log.WithContext(context.Background())

ocis/pkg/command/nats.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/nats/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/nats/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func NatsCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Nats.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Nats.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/notifications.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/notifications/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/notifications/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func NotificationsCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Notifications.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Notifications.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/ocdav.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/ocdav/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/ocdav/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func OCDavCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.OCDav.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.OCDav.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/ocs.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/ocs/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/ocs/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func OCSCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.OCS.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.OCS.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/proxy.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/proxy/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/proxy/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func ProxyCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Proxy.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Proxy.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/search.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/search/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/search/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func SearchCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Search.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Search.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/server.go

@@ -14,7 +14,7 @@ import (
 func Server(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     "server",
-		Usage:    "start a fullstack server (runtime and all extensions in supervised mode)",
+		Usage:    "start a fullstack server (runtime and all services in supervised mode)",
 		Category: "fullstack",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, false); err != nil {

ocis/pkg/command/settings.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/settings/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/settings/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func SettingsCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Settings.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Settings.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/sharing.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/sharing/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/sharing/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func SharingCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Sharing.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Sharing.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/storage-publiclink.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func StoragePublicLinkCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.StoragePublicLink.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.StoragePublicLink.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/storage-shares.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/storage-shares/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func StorageSharesCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.StorageShares.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.StorageShares.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/storage-system.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/storage-system/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/storage-system/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func StorageSystemCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.StorageSystem.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.StorageSystem.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/storage-users.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/storage-users/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/storage-users/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func StorageUsersCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.StorageUsers.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.StorageUsers.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/store.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/store/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/store/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -17,7 +17,7 @@ func StoreCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Store.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Store.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/thumbnails.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/thumbnails/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func ThumbnailsCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Thumbnails.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Thumbnails.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/users.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/users/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/users/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func UsersCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Users.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Users.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/web.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/web/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/web/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -16,7 +16,7 @@ func WebCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.Web.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.Web.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/command/webdav.go

@@ -3,11 +3,11 @@ package command
 import (
 	"fmt"
 
-	"github.com/owncloud/ocis/v2/extensions/webdav/pkg/command"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/v2/ocis/pkg/command/helper"
 	"github.com/owncloud/ocis/v2/ocis/pkg/register"
+	"github.com/owncloud/ocis/v2/services/webdav/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
@@ -17,7 +17,7 @@ func WebDAVCommand(cfg *config.Config) *cli.Command {
 	return &cli.Command{
 		Name:     cfg.WebDAV.Service.Name,
 		Usage:    helper.SubcommandDescription(cfg.WebDAV.Service.Name),
-		Category: "extensions",
+		Category: "services",
 		Before: func(c *cli.Context) error {
 			if err := parser.ParseConfig(cfg, true); err != nil {
 				fmt.Printf("%v", err)

ocis/pkg/runtime/cmd/list.go

@@ -15,7 +15,7 @@ func List(cfg *config.Config) *cobra.Command {
 	return &cobra.Command{
 		Use:     "list",
 		Aliases: []string{"r"},
-		Short:   "List running extensions",
+		Short:   "List running services",
 		Run: func(cmd *cobra.Command, args []string) {
 			client, err := rpc.DialHTTP("tcp", net.JoinHostPort(cfg.Hostname, cfg.Port))
 			if err != nil {

ocis/pkg/runtime/service/service.go

@@ -19,37 +19,37 @@ import (
 	"github.com/mohae/deepcopy"
 	"github.com/olekukonko/tablewriter"
 
-	appProvider "github.com/owncloud/ocis/v2/extensions/app-provider/pkg/command"
-	appRegistry "github.com/owncloud/ocis/v2/extensions/app-registry/pkg/command"
-	authbasic "github.com/owncloud/ocis/v2/extensions/auth-basic/pkg/command"
-	authbearer "github.com/owncloud/ocis/v2/extensions/auth-bearer/pkg/command"
-	authmachine "github.com/owncloud/ocis/v2/extensions/auth-machine/pkg/command"
-	frontend "github.com/owncloud/ocis/v2/extensions/frontend/pkg/command"
-	gateway "github.com/owncloud/ocis/v2/extensions/gateway/pkg/command"
-	graphExplorer "github.com/owncloud/ocis/v2/extensions/graph-explorer/pkg/command"
-	graph "github.com/owncloud/ocis/v2/extensions/graph/pkg/command"
-	groups "github.com/owncloud/ocis/v2/extensions/groups/pkg/command"
-	idm "github.com/owncloud/ocis/v2/extensions/idm/pkg/command"
-	idp "github.com/owncloud/ocis/v2/extensions/idp/pkg/command"
-	nats "github.com/owncloud/ocis/v2/extensions/nats/pkg/command"
-	notifications "github.com/owncloud/ocis/v2/extensions/notifications/pkg/command"
-	ocdav "github.com/owncloud/ocis/v2/extensions/ocdav/pkg/command"
-	ocs "github.com/owncloud/ocis/v2/extensions/ocs/pkg/command"
-	proxy "github.com/owncloud/ocis/v2/extensions/proxy/pkg/command"
-	search "github.com/owncloud/ocis/v2/extensions/search/pkg/command"
-	settings "github.com/owncloud/ocis/v2/extensions/settings/pkg/command"
-	sharing "github.com/owncloud/ocis/v2/extensions/sharing/pkg/command"
-	storagepublic "github.com/owncloud/ocis/v2/extensions/storage-publiclink/pkg/command"
-	storageshares "github.com/owncloud/ocis/v2/extensions/storage-shares/pkg/command"
-	storageSystem "github.com/owncloud/ocis/v2/extensions/storage-system/pkg/command"
-	storageusers "github.com/owncloud/ocis/v2/extensions/storage-users/pkg/command"
-	store "github.com/owncloud/ocis/v2/extensions/store/pkg/command"
-	thumbnails "github.com/owncloud/ocis/v2/extensions/thumbnails/pkg/command"
-	users "github.com/owncloud/ocis/v2/extensions/users/pkg/command"
-	web "github.com/owncloud/ocis/v2/extensions/web/pkg/command"
-	webdav "github.com/owncloud/ocis/v2/extensions/webdav/pkg/command"
 	ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config"
 	"github.com/owncloud/ocis/v2/ocis-pkg/log"
+	appProvider "github.com/owncloud/ocis/v2/services/app-provider/pkg/command"
+	appRegistry "github.com/owncloud/ocis/v2/services/app-registry/pkg/command"
+	authbasic "github.com/owncloud/ocis/v2/services/auth-basic/pkg/command"
+	authbearer "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/command"
+	authmachine "github.com/owncloud/ocis/v2/services/auth-machine/pkg/command"
+	frontend "github.com/owncloud/ocis/v2/services/frontend/pkg/command"
+	gateway "github.com/owncloud/ocis/v2/services/gateway/pkg/command"
+	graphExplorer "github.com/owncloud/ocis/v2/services/graph-explorer/pkg/command"
+	graph "github.com/owncloud/ocis/v2/services/graph/pkg/command"
+	groups "github.com/owncloud/ocis/v2/services/groups/pkg/command"
+	idm "github.com/owncloud/ocis/v2/services/idm/pkg/command"
+	idp "github.com/owncloud/ocis/v2/services/idp/pkg/command"
+	nats "github.com/owncloud/ocis/v2/services/nats/pkg/command"
+	notifications "github.com/owncloud/ocis/v2/services/notifications/pkg/command"
+	ocdav "github.com/owncloud/ocis/v2/services/ocdav/pkg/command"
+	ocs "github.com/owncloud/ocis/v2/services/ocs/pkg/command"
+	proxy "github.com/owncloud/ocis/v2/services/proxy/pkg/command"
+	search "github.com/owncloud/ocis/v2/services/search/pkg/command"
+	settings "github.com/owncloud/ocis/v2/services/settings/pkg/command"
+	sharing "github.com/owncloud/ocis/v2/services/sharing/pkg/command"
+	storagepublic "github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/command"
+	storageshares "github.com/owncloud/ocis/v2/services/storage-shares/pkg/command"
+	storageSystem "github.com/owncloud/ocis/v2/services/storage-system/pkg/command"
+	storageusers "github.com/owncloud/ocis/v2/services/storage-users/pkg/command"
+	store "github.com/owncloud/ocis/v2/services/store/pkg/command"
+	thumbnails "github.com/owncloud/ocis/v2/services/thumbnails/pkg/command"
+	users "github.com/owncloud/ocis/v2/services/users/pkg/command"
+	web "github.com/owncloud/ocis/v2/services/web/pkg/command"
+	webdav "github.com/owncloud/ocis/v2/services/webdav/pkg/command"
 	"github.com/rs/zerolog"
 	"github.com/thejerf/suture/v4"
 	"go-micro.dev/v4/logger"