diff --git a/ocis/pkg/command/antivirus.go b/ocis/pkg/command/antivirus.go
deleted file mode 100644
index 24cd36efba..0000000000
--- a/ocis/pkg/command/antivirus.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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/antivirus/pkg/command"
-	"github.com/urfave/cli/v2"
-)
-
-// AntivirusCommand is the entrypoint for the antivirus command.
-func AntivirusCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Antivirus.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Antivirus.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Antivirus),
-	}
-}
-
-func init() {
-	register.AddCommand(AntivirusCommand)
-}
diff --git a/ocis/pkg/command/app-provider.go b/ocis/pkg/command/app-provider.go
deleted file mode 100644
index 50f20ce766..0000000000
--- a/ocis/pkg/command/app-provider.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// AppProviderCommand is the entrypoint for the app provider command.
-func AppProviderCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.AppProvider.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.AppProvider.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.AppProvider.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.AppProvider),
-	}
-}
-
-func init() {
-	register.AddCommand(AppProviderCommand)
-}
diff --git a/ocis/pkg/command/app-registry.go b/ocis/pkg/command/app-registry.go
deleted file mode 100644
index d35fcabb42..0000000000
--- a/ocis/pkg/command/app-registry.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// AppRegistryCommand is the entrypoint for the AppRegistry command.
-func AppRegistryCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.AppRegistry.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.AppRegistry.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.AppRegistry.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.AppRegistry),
-	}
-}
-
-func init() {
-	register.AddCommand(AppRegistryCommand)
-}
diff --git a/ocis/pkg/command/audit.go b/ocis/pkg/command/audit.go
deleted file mode 100644
index 7299a71a84..0000000000
--- a/ocis/pkg/command/audit.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// AuditCommand is the entrypoint for the Audit command.
-func AuditCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Audit.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Audit.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Audit.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Audit),
-	}
-}
-
-func init() {
-	register.AddCommand(AuditCommand)
-}
diff --git a/ocis/pkg/command/auth-basic.go b/ocis/pkg/command/auth-basic.go
deleted file mode 100644
index 48a026647c..0000000000
--- a/ocis/pkg/command/auth-basic.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// AuthBasicCommand is the entrypoint for the AuthBasic command.
-func AuthBasicCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.AuthBasic.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.AuthBasic.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.AuthBasic.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.AuthBasic),
-	}
-}
-
-func init() {
-	register.AddCommand(AuthBasicCommand)
-}
diff --git a/ocis/pkg/command/auth-bearer.go b/ocis/pkg/command/auth-bearer.go
deleted file mode 100644
index 413e15e9ef..0000000000
--- a/ocis/pkg/command/auth-bearer.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// AuthBearerCommand is the entrypoint for the AuthBearer command.
-func AuthBearerCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.AuthBearer.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.AuthBearer.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.AuthBearer.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.AuthBearer),
-	}
-}
-
-func init() {
-	register.AddCommand(AuthBearerCommand)
-}
diff --git a/ocis/pkg/command/auth-machine.go b/ocis/pkg/command/auth-machine.go
deleted file mode 100644
index 17c23b632f..0000000000
--- a/ocis/pkg/command/auth-machine.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// AuthMachineCommand is the entrypoint for the AuthMachine command.
-func AuthMachineCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.AuthMachine.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.AuthMachine.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.AuthMachine.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.AuthMachine),
-	}
-}
-
-func init() {
-	register.AddCommand(AuthMachineCommand)
-}
diff --git a/ocis/pkg/command/eventhistory.go b/ocis/pkg/command/eventhistory.go
deleted file mode 100644
index a75122210f..0000000000
--- a/ocis/pkg/command/eventhistory.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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/eventhistory/pkg/command"
-	"github.com/urfave/cli/v2"
-)
-
-// EventHistoryCommand is the entrypoint for the eventhistory command.
-func EventHistoryCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.EventHistory.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.EventHistory.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.EventHistory.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.EventHistory),
-	}
-}
-
-func init() {
-	register.AddCommand(EventHistoryCommand)
-}
diff --git a/ocis/pkg/command/frontend.go b/ocis/pkg/command/frontend.go
deleted file mode 100644
index ae28f41059..0000000000
--- a/ocis/pkg/command/frontend.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// FrontendCommand is the entrypoint for the Frontend command.
-func FrontendCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Frontend.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Frontend.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Frontend.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Frontend),
-	}
-}
-
-func init() {
-	register.AddCommand(FrontendCommand)
-}
diff --git a/ocis/pkg/command/gateway.go b/ocis/pkg/command/gateway.go
deleted file mode 100644
index 3562ffade5..0000000000
--- a/ocis/pkg/command/gateway.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// GatewayCommand is the entrypoint for the Gateway command.
-func GatewayCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Gateway.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Gateway.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Gateway.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Gateway),
-	}
-}
-
-func init() {
-	register.AddCommand(GatewayCommand)
-}
diff --git a/ocis/pkg/command/graph.go b/ocis/pkg/command/graph.go
deleted file mode 100644
index 4ff45e2313..0000000000
--- a/ocis/pkg/command/graph.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// GraphCommand is the entrypoint for the graph command.
-func GraphCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Graph.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Graph.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Graph.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Graph),
-	}
-}
-
-func init() {
-	register.AddCommand(GraphCommand)
-}
diff --git a/ocis/pkg/command/groups.go b/ocis/pkg/command/groups.go
deleted file mode 100644
index 630f1060ee..0000000000
--- a/ocis/pkg/command/groups.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// GroupsCommand is the entrypoint for the groups command.
-func GroupsCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Groups.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Groups.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Groups.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Groups),
-	}
-}
-
-func init() {
-	register.AddCommand(GroupsCommand)
-}
diff --git a/ocis/pkg/command/idm.go b/ocis/pkg/command/idm.go
deleted file mode 100644
index 3adc837388..0000000000
--- a/ocis/pkg/command/idm.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// IDMCommand is the entrypoint for the idm command.
-func IDMCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.IDM.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.IDM.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.IDM.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.IDM),
-	}
-}
-
-func init() {
-	register.AddCommand(IDMCommand)
-}
diff --git a/ocis/pkg/command/idp.go b/ocis/pkg/command/idp.go
deleted file mode 100644
index b8f0449c78..0000000000
--- a/ocis/pkg/command/idp.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// IDPCommand is the entrypoint for the idp command.
-func IDPCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.IDP.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.IDP.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.IDP.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.IDP),
-	}
-}
-
-func init() {
-	register.AddCommand(IDPCommand)
-}
diff --git a/ocis/pkg/command/invitations.go b/ocis/pkg/command/invitations.go
deleted file mode 100644
index 984d8adf85..0000000000
--- a/ocis/pkg/command/invitations.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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/invitations/pkg/command"
-	"github.com/urfave/cli/v2"
-)
-
-// InvitationsCommand is the entrypoint for the invitations command.
-func InvitationsCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Invitations.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Invitations.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Invitations.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Invitations),
-	}
-}
-
-func init() {
-	register.AddCommand(InvitationsCommand)
-}
diff --git a/ocis/pkg/command/nats.go b/ocis/pkg/command/nats.go
deleted file mode 100644
index 989286c0ae..0000000000
--- a/ocis/pkg/command/nats.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// NatsCommand is the entrypoint for the Nats command.
-func NatsCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Nats.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Nats.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Nats.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Nats),
-	}
-}
-
-func init() {
-	register.AddCommand(NatsCommand)
-}
diff --git a/ocis/pkg/command/notifications.go b/ocis/pkg/command/notifications.go
deleted file mode 100644
index 0fc591f146..0000000000
--- a/ocis/pkg/command/notifications.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// NotificationsCommand is the entrypoint for the notifications command.
-func NotificationsCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Notifications.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Notifications.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Notifications.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Notifications),
-	}
-}
-
-func init() {
-	register.AddCommand(NotificationsCommand)
-}
diff --git a/ocis/pkg/command/ocdav.go b/ocis/pkg/command/ocdav.go
deleted file mode 100644
index a46cd3ecf5..0000000000
--- a/ocis/pkg/command/ocdav.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// OCDavCommand is the entrypoint for the OCDav command.
-func OCDavCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.OCDav.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.OCDav.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.OCDav.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.OCDav),
-	}
-}
-
-func init() {
-	register.AddCommand(OCDavCommand)
-}
diff --git a/ocis/pkg/command/ocs.go b/ocis/pkg/command/ocs.go
deleted file mode 100644
index 89091138c4..0000000000
--- a/ocis/pkg/command/ocs.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// OCSCommand is the entrypoint for the ocs command.
-func OCSCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.OCS.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.OCS.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.OCS.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.OCS),
-	}
-}
-
-func init() {
-	register.AddCommand(OCSCommand)
-}
diff --git a/ocis/pkg/command/policies.go b/ocis/pkg/command/policies.go
deleted file mode 100644
index 69540d50bb..0000000000
--- a/ocis/pkg/command/policies.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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/policies/pkg/command"
-	"github.com/urfave/cli/v2"
-)
-
-// PoliciesCommand is the entrypoint for the policies service.
-func PoliciesCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Policies.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Policies.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Policies.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Policies),
-	}
-}
-
-func init() {
-	register.AddCommand(PoliciesCommand)
-}
diff --git a/ocis/pkg/command/postprocessing.go b/ocis/pkg/command/postprocessing.go
deleted file mode 100644
index 0d35a35ac3..0000000000
--- a/ocis/pkg/command/postprocessing.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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/postprocessing/pkg/command"
-	"github.com/urfave/cli/v2"
-)
-
-// PostprocessingCommand is the entrypoint for the postprocessing command.
-func PostprocessingCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Postprocessing.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Postprocessing.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Postprocessing.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Postprocessing),
-	}
-}
-
-func init() {
-	register.AddCommand(PostprocessingCommand)
-}
diff --git a/ocis/pkg/command/proxy.go b/ocis/pkg/command/proxy.go
deleted file mode 100644
index 0bdbf71e25..0000000000
--- a/ocis/pkg/command/proxy.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// ProxyCommand is the entry point for the proxy command.
-func ProxyCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Proxy.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Proxy.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Proxy.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Proxy),
-	}
-}
-
-func init() {
-	register.AddCommand(ProxyCommand)
-}
diff --git a/ocis/pkg/command/search.go b/ocis/pkg/command/search.go
deleted file mode 100644
index 59cb691e9e..0000000000
--- a/ocis/pkg/command/search.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// SearchCommand is the entry point for the search command.
-func SearchCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Search.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Search.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Search.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Search),
-	}
-}
-
-func init() {
-	register.AddCommand(SearchCommand)
-}
diff --git a/ocis/pkg/command/services.go b/ocis/pkg/command/services.go
new file mode 100644
index 0000000000..801ba45602
--- /dev/null
+++ b/ocis/pkg/command/services.go
@@ -0,0 +1,214 @@
+package command
+
+import (
+	"github.com/owncloud/ocis/v2/ocis-pkg/config"
+	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
+	"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/urfave/cli/v2"
+
+	antivirus "github.com/owncloud/ocis/v2/services/antivirus/pkg/command"
+	appprovider "github.com/owncloud/ocis/v2/services/app-provider/pkg/command"
+	appregistry "github.com/owncloud/ocis/v2/services/app-registry/pkg/command"
+	audit "github.com/owncloud/ocis/v2/services/audit/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"
+	eventhistory "github.com/owncloud/ocis/v2/services/eventhistory/pkg/command"
+	frontend "github.com/owncloud/ocis/v2/services/frontend/pkg/command"
+	gateway "github.com/owncloud/ocis/v2/services/gateway/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"
+	invitations "github.com/owncloud/ocis/v2/services/invitations/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"
+	policies "github.com/owncloud/ocis/v2/services/policies/pkg/command"
+	postprocessing "github.com/owncloud/ocis/v2/services/postprocessing/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"
+	storagepubliclink "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"
+	userlog "github.com/owncloud/ocis/v2/services/userlog/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"
+	webfinger "github.com/owncloud/ocis/v2/services/webfinger/pkg/command"
+)
+
+var svccmds = []register.Command{
+	func(cfg *config.Config) *cli.Command {
+		// cfg.Antivirus.Commons = cfg.Commons // antivirus needs no commons atm
+		return ServiceCommand(cfg, cfg.Antivirus.Service.Name, antivirus.GetCommands(cfg.Antivirus))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.AppProvider.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.AppProvider.Service.Name, appprovider.GetCommands(cfg.AppProvider))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.AppRegistry.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.AppRegistry.Service.Name, appregistry.GetCommands(cfg.AppRegistry))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Audit.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Audit.Service.Name, audit.GetCommands(cfg.Audit))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.AuthBasic.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.AuthBasic.Service.Name, authbasic.GetCommands(cfg.AuthBasic))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.AuthBearer.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.AuthBearer.Service.Name, authbearer.GetCommands(cfg.AuthBearer))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.AuthMachine.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.AuthMachine.Service.Name, authmachine.GetCommands(cfg.AuthMachine))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.EventHistory.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.EventHistory.Service.Name, eventhistory.GetCommands(cfg.EventHistory))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Frontend.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Frontend.Service.Name, frontend.GetCommands(cfg.Frontend))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Gateway.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Gateway.Service.Name, gateway.GetCommands(cfg.Gateway))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Graph.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Graph.Service.Name, graph.GetCommands(cfg.Graph))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Groups.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Groups.Service.Name, groups.GetCommands(cfg.Groups))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.IDM.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.IDM.Service.Name, idm.GetCommands(cfg.IDM))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.IDP.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.IDP.Service.Name, idp.GetCommands(cfg.IDP))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Invitations.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Invitations.Service.Name, invitations.GetCommands(cfg.Invitations))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Nats.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Nats.Service.Name, nats.GetCommands(cfg.Nats))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Notifications.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Notifications.Service.Name, notifications.GetCommands(cfg.Notifications))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.OCDav.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.OCDav.Service.Name, ocdav.GetCommands(cfg.OCDav))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.OCS.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.OCS.Service.Name, ocs.GetCommands(cfg.OCS))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Policies.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Policies.Service.Name, policies.GetCommands(cfg.Policies))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Postprocessing.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Postprocessing.Service.Name, postprocessing.GetCommands(cfg.Postprocessing))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Proxy.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Proxy.Service.Name, proxy.GetCommands(cfg.Proxy))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Search.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Search.Service.Name, search.GetCommands(cfg.Search))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Settings.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Settings.Service.Name, settings.GetCommands(cfg.Settings))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Sharing.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Sharing.Service.Name, sharing.GetCommands(cfg.Sharing))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.StoragePublicLink.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.StoragePublicLink.Service.Name, storagepubliclink.GetCommands(cfg.StoragePublicLink))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.StorageShares.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.StorageShares.Service.Name, storageshares.GetCommands(cfg.StorageShares))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.StorageSystem.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.StorageSystem.Service.Name, storagesystem.GetCommands(cfg.StorageSystem))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.StorageUsers.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.StorageUsers.Service.Name, storageusers.GetCommands(cfg.StorageUsers))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Store.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Store.Service.Name, store.GetCommands(cfg.Store))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Thumbnails.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Thumbnails.Service.Name, thumbnails.GetCommands(cfg.Thumbnails))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Userlog.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Userlog.Service.Name, userlog.GetCommands(cfg.Userlog))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Users.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Users.Service.Name, users.GetCommands(cfg.Users))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Web.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Web.Service.Name, web.GetCommands(cfg.Web))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.WebDAV.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.WebDAV.Service.Name, webdav.GetCommands(cfg.WebDAV))
+	},
+	func(cfg *config.Config) *cli.Command {
+		cfg.Webfinger.Commons = cfg.Commons
+		return ServiceCommand(cfg, cfg.Webfinger.Service.Name, webfinger.GetCommands(cfg.Webfinger))
+	},
+}
+
+// ServiceCommand is the entry point for the all service commands.
+func ServiceCommand(cfg *config.Config, servicename string, subcommands []*cli.Command) *cli.Command {
+	return &cli.Command{
+		Name:     servicename,
+		Usage:    helper.SubcommandDescription(servicename),
+		Category: "services",
+		Before: func(c *cli.Context) error {
+			configlog.Error(parser.ParseConfig(cfg, true))
+			return nil
+		},
+		Subcommands: subcommands,
+	}
+}
+
+func init() {
+	for _, c := range svccmds {
+		register.AddCommand(c)
+	}
+}
diff --git a/ocis/pkg/command/settings.go b/ocis/pkg/command/settings.go
deleted file mode 100644
index d5950b2096..0000000000
--- a/ocis/pkg/command/settings.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// SettingsCommand is the entry point for the settings command.
-func SettingsCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Settings.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Settings.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Settings.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Settings),
-	}
-}
-
-func init() {
-	register.AddCommand(SettingsCommand)
-}
diff --git a/ocis/pkg/command/sharing.go b/ocis/pkg/command/sharing.go
deleted file mode 100644
index 31ccc40ca2..0000000000
--- a/ocis/pkg/command/sharing.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// SharingCommand is the entrypoint for the Sharing command.
-func SharingCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Sharing.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Sharing.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Sharing.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Sharing),
-	}
-}
-
-func init() {
-	register.AddCommand(SharingCommand)
-}
diff --git a/ocis/pkg/command/storage-publiclink.go b/ocis/pkg/command/storage-publiclink.go
deleted file mode 100644
index 1819089247..0000000000
--- a/ocis/pkg/command/storage-publiclink.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// StoragePublicLinkCommand is the entrypoint for the StoragePublicLink command.
-func StoragePublicLinkCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.StoragePublicLink.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.StoragePublicLink.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.StoragePublicLink.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.StoragePublicLink),
-	}
-}
-
-func init() {
-	register.AddCommand(StoragePublicLinkCommand)
-}
diff --git a/ocis/pkg/command/storage-shares.go b/ocis/pkg/command/storage-shares.go
deleted file mode 100644
index 6def892696..0000000000
--- a/ocis/pkg/command/storage-shares.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// StorageSharesCommand is the entrypoint for the StorageShares command.
-func StorageSharesCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.StorageShares.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.StorageShares.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.StorageShares.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.StorageShares),
-	}
-}
-
-func init() {
-	register.AddCommand(StorageSharesCommand)
-}
diff --git a/ocis/pkg/command/storage-system.go b/ocis/pkg/command/storage-system.go
deleted file mode 100644
index cd933eeeaa..0000000000
--- a/ocis/pkg/command/storage-system.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// StorageSystemCommand is the entrypoint for the StorageSystem command.
-func StorageSystemCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.StorageSystem.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.StorageSystem.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.StorageSystem.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.StorageSystem),
-	}
-}
-
-func init() {
-	register.AddCommand(StorageSystemCommand)
-}
diff --git a/ocis/pkg/command/storage-users.go b/ocis/pkg/command/storage-users.go
deleted file mode 100644
index 980cc953d6..0000000000
--- a/ocis/pkg/command/storage-users.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// StorageUsersCommand is the entrypoint for the StorageUsers command.
-func StorageUsersCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.StorageUsers.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.StorageUsers.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.StorageUsers.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.StorageUsers),
-	}
-}
-
-func init() {
-	register.AddCommand(StorageUsersCommand)
-}
diff --git a/ocis/pkg/command/store.go b/ocis/pkg/command/store.go
deleted file mode 100644
index 947779d71e..0000000000
--- a/ocis/pkg/command/store.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// StoreCommand is the entrypoint for the ocs command.
-func StoreCommand(cfg *config.Config) *cli.Command {
-
-	return &cli.Command{
-		Name:     cfg.Store.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Store.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Store.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Store),
-	}
-}
-
-func init() {
-	register.AddCommand(StoreCommand)
-}
diff --git a/ocis/pkg/command/thumbnails.go b/ocis/pkg/command/thumbnails.go
deleted file mode 100644
index 235edfafb3..0000000000
--- a/ocis/pkg/command/thumbnails.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// ThumbnailsCommand is the entrypoint for the thumbnails command.
-func ThumbnailsCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Thumbnails.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Thumbnails.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Thumbnails.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Thumbnails),
-	}
-}
-
-func init() {
-	register.AddCommand(ThumbnailsCommand)
-}
diff --git a/ocis/pkg/command/userlog.go b/ocis/pkg/command/userlog.go
deleted file mode 100644
index 363b7d30b0..0000000000
--- a/ocis/pkg/command/userlog.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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/userlog/pkg/command"
-	"github.com/urfave/cli/v2"
-)
-
-// UserlogCommand is the entrypoint for the userlog command.
-func UserlogCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Userlog.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Userlog.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Userlog.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Userlog),
-	}
-}
-
-func init() {
-	register.AddCommand(UserlogCommand)
-}
diff --git a/ocis/pkg/command/users.go b/ocis/pkg/command/users.go
deleted file mode 100644
index 905c757187..0000000000
--- a/ocis/pkg/command/users.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// UsersCommand is the entrypoint for the users command.
-func UsersCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Users.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Users.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Users.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Users),
-	}
-}
-
-func init() {
-	register.AddCommand(UsersCommand)
-}
diff --git a/ocis/pkg/command/web.go b/ocis/pkg/command/web.go
deleted file mode 100644
index e7b1f001df..0000000000
--- a/ocis/pkg/command/web.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// WebCommand is the entrypoint for the web command.
-func WebCommand(cfg *config.Config) *cli.Command {
-	return &cli.Command{
-		Name:     cfg.Web.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Web.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Web.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Web),
-	}
-}
-
-func init() {
-	register.AddCommand(WebCommand)
-}
diff --git a/ocis/pkg/command/webdav.go b/ocis/pkg/command/webdav.go
deleted file mode 100644
index 6acd8ec596..0000000000
--- a/ocis/pkg/command/webdav.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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"
-)
-
-// WebDAVCommand is the entrypoint for the webdav command.
-func WebDAVCommand(cfg *config.Config) *cli.Command {
-
-	return &cli.Command{
-		Name:     cfg.WebDAV.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.WebDAV.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.WebDAV.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.WebDAV),
-	}
-}
-
-func init() {
-	register.AddCommand(WebDAVCommand)
-}
diff --git a/ocis/pkg/command/webfinger.go b/ocis/pkg/command/webfinger.go
deleted file mode 100644
index e01fde8648..0000000000
--- a/ocis/pkg/command/webfinger.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package command
-
-import (
-	"github.com/owncloud/ocis/v2/ocis-pkg/config"
-	"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
-	"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/webfinger/pkg/command"
-	"github.com/urfave/cli/v2"
-)
-
-// WebfingerCommand is the entrypoint for the webfinger command.
-func WebfingerCommand(cfg *config.Config) *cli.Command {
-
-	return &cli.Command{
-		Name:     cfg.Webfinger.Service.Name,
-		Usage:    helper.SubcommandDescription(cfg.Webfinger.Service.Name),
-		Category: "services",
-		Before: func(c *cli.Context) error {
-			configlog.Error(parser.ParseConfig(cfg, true))
-			cfg.Webfinger.Commons = cfg.Commons
-			return nil
-		},
-		Subcommands: command.GetCommands(cfg.Webfinger),
-	}
-}
-
-func init() {
-	register.AddCommand(WebfingerCommand)
-}