diff --git a/audit/Makefile b/extensions/audit/Makefile
similarity index 78%
rename from audit/Makefile
rename to extensions/audit/Makefile
index c95031e52..522b7bfcb 100644
--- a/audit/Makefile
+++ b/extensions/audit/Makefile
@@ -1,27 +1,27 @@
 SHELL := bash
 NAME := audit
 
-include ../.make/recursion.mk
+include ../../.make/recursion.mk
 
 ############ tooling ############
 ifneq (, $(shell which go 2> /dev/null)) # suppress `command not found warnings` for non go targets in CI
-include ../.bingo/Variables.mk
+include ../../.bingo/Variables.mk
 endif
 
 ############ go tooling ############
-include ../.make/go.mk
+include ../../.make/go.mk
 
 ############ release ############
-include ../.make/release.mk
+include ../../.make/release.mk
 
 ############ docs generate ############
-include ../.make/docs.mk
+include ../../.make/docs.mk
 
 .PHONY: docs-generate
 docs-generate: config-docs-generate
 
 ############ generate ############
-include ../.make/generate.mk
+include ../../.make/generate.mk
 
 .PHONY: ci-go-generate
 ci-go-generate: # CI runs ci-node-generate automatically before this target
diff --git a/audit/cmd/notifications/main.go b/extensions/audit/cmd/audit/main.go
similarity index 51%
rename from audit/cmd/notifications/main.go
rename to extensions/audit/cmd/audit/main.go
index 68f15f670..82da7af3a 100644
--- a/audit/cmd/notifications/main.go
+++ b/extensions/audit/cmd/audit/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"github.com/owncloud/ocis/audit/pkg/command"
-	"github.com/owncloud/ocis/audit/pkg/config/defaults"
+	"github.com/owncloud/ocis/extensions/audit/pkg/command"
+	"github.com/owncloud/ocis/extensions/audit/pkg/config/defaults"
 )
 
 func main() {
diff --git a/audit/pkg/command/health.go b/extensions/audit/pkg/command/health.go
similarity index 84%
rename from audit/pkg/command/health.go
rename to extensions/audit/pkg/command/health.go
index 4dbaa30fb..6dfbc30b7 100644
--- a/audit/pkg/command/health.go
+++ b/extensions/audit/pkg/command/health.go
@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/audit/pkg/config"
+	"github.com/owncloud/ocis/extensions/audit/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/audit/pkg/command/root.go b/extensions/audit/pkg/command/root.go
similarity index 95%
rename from audit/pkg/command/root.go
rename to extensions/audit/pkg/command/root.go
index 5c2124f18..d3cd62ee4 100644
--- a/audit/pkg/command/root.go
+++ b/extensions/audit/pkg/command/root.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"os"
 
-	"github.com/owncloud/ocis/audit/pkg/config"
+	"github.com/owncloud/ocis/extensions/audit/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/clihelper"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/thejerf/suture/v4"
diff --git a/audit/pkg/command/server.go b/extensions/audit/pkg/command/server.go
similarity index 80%
rename from audit/pkg/command/server.go
rename to extensions/audit/pkg/command/server.go
index 74518348d..25a031da0 100644
--- a/audit/pkg/command/server.go
+++ b/extensions/audit/pkg/command/server.go
@@ -7,11 +7,11 @@ import (
 	"github.com/asim/go-micro/plugins/events/natsjs/v4"
 	"github.com/cs3org/reva/v2/pkg/events"
 	"github.com/cs3org/reva/v2/pkg/events/server"
-	"github.com/owncloud/ocis/audit/pkg/config"
-	"github.com/owncloud/ocis/audit/pkg/config/parser"
-	"github.com/owncloud/ocis/audit/pkg/logging"
-	svc "github.com/owncloud/ocis/audit/pkg/service"
-	"github.com/owncloud/ocis/audit/pkg/types"
+	"github.com/owncloud/ocis/extensions/audit/pkg/config"
+	"github.com/owncloud/ocis/extensions/audit/pkg/config/parser"
+	"github.com/owncloud/ocis/extensions/audit/pkg/logging"
+	svc "github.com/owncloud/ocis/extensions/audit/pkg/service"
+	"github.com/owncloud/ocis/extensions/audit/pkg/types"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/audit/pkg/command/version.go b/extensions/audit/pkg/command/version.go
similarity index 87%
rename from audit/pkg/command/version.go
rename to extensions/audit/pkg/command/version.go
index db018de57..83bccd714 100644
--- a/audit/pkg/command/version.go
+++ b/extensions/audit/pkg/command/version.go
@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/audit/pkg/config"
+	"github.com/owncloud/ocis/extensions/audit/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/audit/pkg/config/config.go b/extensions/audit/pkg/config/config.go
similarity index 100%
rename from audit/pkg/config/config.go
rename to extensions/audit/pkg/config/config.go
diff --git a/audit/pkg/config/debug.go b/extensions/audit/pkg/config/debug.go
similarity index 100%
rename from audit/pkg/config/debug.go
rename to extensions/audit/pkg/config/debug.go
diff --git a/audit/pkg/config/defaults/defaultconfig.go b/extensions/audit/pkg/config/defaults/defaultconfig.go
similarity index 94%
rename from audit/pkg/config/defaults/defaultconfig.go
rename to extensions/audit/pkg/config/defaults/defaultconfig.go
index ed1c1a822..27b94a814 100644
--- a/audit/pkg/config/defaults/defaultconfig.go
+++ b/extensions/audit/pkg/config/defaults/defaultconfig.go
@@ -1,7 +1,7 @@
 package defaults
 
 import (
-	"github.com/owncloud/ocis/audit/pkg/config"
+	"github.com/owncloud/ocis/extensions/audit/pkg/config"
 )
 
 func FullDefaultConfig() *config.Config {
diff --git a/audit/pkg/config/log.go b/extensions/audit/pkg/config/log.go
similarity index 100%
rename from audit/pkg/config/log.go
rename to extensions/audit/pkg/config/log.go
diff --git a/audit/pkg/config/parser/parse.go b/extensions/audit/pkg/config/parser/parse.go
similarity index 85%
rename from audit/pkg/config/parser/parse.go
rename to extensions/audit/pkg/config/parser/parse.go
index 51be3a53c..7c9179761 100644
--- a/audit/pkg/config/parser/parse.go
+++ b/extensions/audit/pkg/config/parser/parse.go
@@ -3,8 +3,8 @@ package parser
 import (
 	"errors"
 
-	"github.com/owncloud/ocis/audit/pkg/config"
-	"github.com/owncloud/ocis/audit/pkg/config/defaults"
+	"github.com/owncloud/ocis/extensions/audit/pkg/config"
+	"github.com/owncloud/ocis/extensions/audit/pkg/config/defaults"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 
 	"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
diff --git a/audit/pkg/config/service.go b/extensions/audit/pkg/config/service.go
similarity index 100%
rename from audit/pkg/config/service.go
rename to extensions/audit/pkg/config/service.go
diff --git a/audit/pkg/logging/logging.go b/extensions/audit/pkg/logging/logging.go
similarity index 85%
rename from audit/pkg/logging/logging.go
rename to extensions/audit/pkg/logging/logging.go
index 4b415776f..c87d7f328 100644
--- a/audit/pkg/logging/logging.go
+++ b/extensions/audit/pkg/logging/logging.go
@@ -1,7 +1,7 @@
 package logging
 
 import (
-	"github.com/owncloud/ocis/audit/pkg/config"
+	"github.com/owncloud/ocis/extensions/audit/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 
diff --git a/audit/pkg/service/service.go b/extensions/audit/pkg/service/service.go
similarity index 97%
rename from audit/pkg/service/service.go
rename to extensions/audit/pkg/service/service.go
index adf16f291..6d42a3b04 100644
--- a/audit/pkg/service/service.go
+++ b/extensions/audit/pkg/service/service.go
@@ -7,8 +7,8 @@ import (
 	"os"
 
 	"github.com/cs3org/reva/v2/pkg/events"
-	"github.com/owncloud/ocis/audit/pkg/config"
-	"github.com/owncloud/ocis/audit/pkg/types"
+	"github.com/owncloud/ocis/extensions/audit/pkg/config"
+	"github.com/owncloud/ocis/extensions/audit/pkg/types"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 
diff --git a/audit/pkg/service/service_test.go b/extensions/audit/pkg/service/service_test.go
similarity index 99%
rename from audit/pkg/service/service_test.go
rename to extensions/audit/pkg/service/service_test.go
index 2849ca699..6fb5dc1ea 100644
--- a/audit/pkg/service/service_test.go
+++ b/extensions/audit/pkg/service/service_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/cs3org/reva/v2/pkg/events"
-	"github.com/owncloud/ocis/audit/pkg/types"
+	"github.com/owncloud/ocis/extensions/audit/pkg/types"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/test-go/testify/require"
 
diff --git a/audit/pkg/types/constants.go b/extensions/audit/pkg/types/constants.go
similarity index 100%
rename from audit/pkg/types/constants.go
rename to extensions/audit/pkg/types/constants.go
diff --git a/audit/pkg/types/conversion.go b/extensions/audit/pkg/types/conversion.go
similarity index 100%
rename from audit/pkg/types/conversion.go
rename to extensions/audit/pkg/types/conversion.go
diff --git a/audit/pkg/types/events.go b/extensions/audit/pkg/types/events.go
similarity index 100%
rename from audit/pkg/types/events.go
rename to extensions/audit/pkg/types/events.go
diff --git a/audit/pkg/types/types.go b/extensions/audit/pkg/types/types.go
similarity index 100%
rename from audit/pkg/types/types.go
rename to extensions/audit/pkg/types/types.go
diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go
index 5ebcfd860..f7c71952e 100644
--- a/ocis-pkg/config/config.go
+++ b/ocis-pkg/config/config.go
@@ -3,8 +3,8 @@ package config
 import (
 	"github.com/owncloud/ocis/ocis-pkg/shared"
 
-	audit "github.com/owncloud/ocis/audit/pkg/config"
 	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config"
+	audit "github.com/owncloud/ocis/extensions/audit/pkg/config"
 	glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config"
 	graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config"
 	graph "github.com/owncloud/ocis/extensions/graph/pkg/config"
diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go
index 9e3a1648b..bc94a224c 100644
--- a/ocis-pkg/config/defaultconfig.go
+++ b/ocis-pkg/config/defaultconfig.go
@@ -1,8 +1,8 @@
 package config
 
 import (
-	audit "github.com/owncloud/ocis/audit/pkg/config/defaults"
 	accounts "github.com/owncloud/ocis/extensions/accounts/pkg/config/defaults"
+	audit "github.com/owncloud/ocis/extensions/audit/pkg/config/defaults"
 	glauth "github.com/owncloud/ocis/extensions/glauth/pkg/config/defaults"
 	graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/config/defaults"
 	graph "github.com/owncloud/ocis/extensions/graph/pkg/config/defaults"
diff --git a/ocis/pkg/command/audit.go b/ocis/pkg/command/audit.go
index 02fbb7a31..638367a16 100644
--- a/ocis/pkg/command/audit.go
+++ b/ocis/pkg/command/audit.go
@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/audit/pkg/command"
+	"github.com/owncloud/ocis/extensions/audit/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/ocis/pkg/register"