diff --git a/idm/Makefile b/extensions/idm/Makefile
similarity index 77%
rename from idm/Makefile
rename to extensions/idm/Makefile
index 4da8f773e8..0d04550af3 100644
--- a/idm/Makefile
+++ b/extensions/idm/Makefile
@@ -1,29 +1,29 @@
 SHELL := bash
-NAME := ocs
+NAME := idm
 
 TAGS := disable_crypt
 
-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/idm/cmd/idm/main.go b/extensions/idm/cmd/idm/main.go
similarity index 52%
rename from idm/cmd/idm/main.go
rename to extensions/idm/cmd/idm/main.go
index 7463a99c78..53727af5b7 100644
--- a/idm/cmd/idm/main.go
+++ b/extensions/idm/cmd/idm/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"github.com/owncloud/ocis/idm/pkg/command"
-	"github.com/owncloud/ocis/idm/pkg/config/defaults"
+	"github.com/owncloud/ocis/extensions/idm/pkg/command"
+	"github.com/owncloud/ocis/extensions/idm/pkg/config/defaults"
 )
 
 func main() {
diff --git a/idm/idm.go b/extensions/idm/idm.go
similarity index 100%
rename from idm/idm.go
rename to extensions/idm/idm.go
diff --git a/idm/ldif/base.ldif.tmpl b/extensions/idm/ldif/base.ldif.tmpl
similarity index 100%
rename from idm/ldif/base.ldif.tmpl
rename to extensions/idm/ldif/base.ldif.tmpl
diff --git a/idm/ldif/demousers.ldif b/extensions/idm/ldif/demousers.ldif
similarity index 100%
rename from idm/ldif/demousers.ldif
rename to extensions/idm/ldif/demousers.ldif
diff --git a/idm/pkg/command/health.go b/extensions/idm/pkg/command/health.go
similarity index 84%
rename from idm/pkg/command/health.go
rename to extensions/idm/pkg/command/health.go
index 2de74ad128..cc61b7c1dc 100644
--- a/idm/pkg/command/health.go
+++ b/extensions/idm/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/owncloud/ocis/idm/pkg/config"
-	"github.com/owncloud/ocis/idm/pkg/config/parser"
-	"github.com/owncloud/ocis/idm/pkg/logging"
+	"github.com/owncloud/ocis/extensions/idm/pkg/config"
+	"github.com/owncloud/ocis/extensions/idm/pkg/config/parser"
+	"github.com/owncloud/ocis/extensions/idm/pkg/logging"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/idm/pkg/command/root.go b/extensions/idm/pkg/command/root.go
similarity index 96%
rename from idm/pkg/command/root.go
rename to extensions/idm/pkg/command/root.go
index 2be9e0a177..50f6444346 100644
--- a/idm/pkg/command/root.go
+++ b/extensions/idm/pkg/command/root.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"os"
 
-	"github.com/owncloud/ocis/idm/pkg/config"
+	"github.com/owncloud/ocis/extensions/idm/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/idm/pkg/command/server.go b/extensions/idm/pkg/command/server.go
similarity index 95%
rename from idm/pkg/command/server.go
rename to extensions/idm/pkg/command/server.go
index 68a4fef9c7..c63b0f2af7 100644
--- a/idm/pkg/command/server.go
+++ b/extensions/idm/pkg/command/server.go
@@ -13,10 +13,10 @@ import (
 	"github.com/libregraph/idm/pkg/ldappassword"
 	"github.com/libregraph/idm/pkg/ldbbolt"
 	"github.com/libregraph/idm/server"
-	"github.com/owncloud/ocis/idm"
-	"github.com/owncloud/ocis/idm/pkg/config"
-	"github.com/owncloud/ocis/idm/pkg/config/parser"
-	"github.com/owncloud/ocis/idm/pkg/logging"
+	"github.com/owncloud/ocis/extensions/idm"
+	"github.com/owncloud/ocis/extensions/idm/pkg/config"
+	"github.com/owncloud/ocis/extensions/idm/pkg/config/parser"
+	"github.com/owncloud/ocis/extensions/idm/pkg/logging"
 	pkgcrypto "github.com/owncloud/ocis/ocis-pkg/crypto"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	"github.com/urfave/cli/v2"
diff --git a/idm/pkg/command/version.go b/extensions/idm/pkg/command/version.go
similarity index 88%
rename from idm/pkg/command/version.go
rename to extensions/idm/pkg/command/version.go
index 4a6faa0c96..bb49863ba2 100644
--- a/idm/pkg/command/version.go
+++ b/extensions/idm/pkg/command/version.go
@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/idm/pkg/config"
+	"github.com/owncloud/ocis/extensions/idm/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/idm/pkg/config/config.go b/extensions/idm/pkg/config/config.go
similarity index 100%
rename from idm/pkg/config/config.go
rename to extensions/idm/pkg/config/config.go
diff --git a/idm/pkg/config/debug.go b/extensions/idm/pkg/config/debug.go
similarity index 100%
rename from idm/pkg/config/debug.go
rename to extensions/idm/pkg/config/debug.go
diff --git a/idm/pkg/config/defaults/defaultconfig.go b/extensions/idm/pkg/config/defaults/defaultconfig.go
similarity index 96%
rename from idm/pkg/config/defaults/defaultconfig.go
rename to extensions/idm/pkg/config/defaults/defaultconfig.go
index 4945ac2e38..983db3c071 100644
--- a/idm/pkg/config/defaults/defaultconfig.go
+++ b/extensions/idm/pkg/config/defaults/defaultconfig.go
@@ -3,7 +3,7 @@ package defaults
 import (
 	"path"
 
-	"github.com/owncloud/ocis/idm/pkg/config"
+	"github.com/owncloud/ocis/extensions/idm/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
 )
 
diff --git a/idm/pkg/config/log.go b/extensions/idm/pkg/config/log.go
similarity index 100%
rename from idm/pkg/config/log.go
rename to extensions/idm/pkg/config/log.go
diff --git a/idm/pkg/config/parser/parse.go b/extensions/idm/pkg/config/parser/parse.go
similarity index 85%
rename from idm/pkg/config/parser/parse.go
rename to extensions/idm/pkg/config/parser/parse.go
index 9847623cfc..0998543ad0 100644
--- a/idm/pkg/config/parser/parse.go
+++ b/extensions/idm/pkg/config/parser/parse.go
@@ -3,8 +3,8 @@ package parser
 import (
 	"errors"
 
-	"github.com/owncloud/ocis/idm/pkg/config"
-	"github.com/owncloud/ocis/idm/pkg/config/defaults"
+	"github.com/owncloud/ocis/extensions/idm/pkg/config"
+	"github.com/owncloud/ocis/extensions/idm/pkg/config/defaults"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 
 	"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
diff --git a/idm/pkg/config/service.go b/extensions/idm/pkg/config/service.go
similarity index 100%
rename from idm/pkg/config/service.go
rename to extensions/idm/pkg/config/service.go
diff --git a/idm/pkg/config/tracing.go b/extensions/idm/pkg/config/tracing.go
similarity index 100%
rename from idm/pkg/config/tracing.go
rename to extensions/idm/pkg/config/tracing.go
diff --git a/idm/pkg/logging/logging.go b/extensions/idm/pkg/logging/logging.go
similarity index 86%
rename from idm/pkg/logging/logging.go
rename to extensions/idm/pkg/logging/logging.go
index b43451cf7f..9a957b5899 100644
--- a/idm/pkg/logging/logging.go
+++ b/extensions/idm/pkg/logging/logging.go
@@ -1,7 +1,7 @@
 package logging
 
 import (
-	"github.com/owncloud/ocis/idm/pkg/config"
+	"github.com/owncloud/ocis/extensions/idm/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 
diff --git a/idm/pkg/server/debug/option.go b/extensions/idm/pkg/server/debug/option.go
similarity index 94%
rename from idm/pkg/server/debug/option.go
rename to extensions/idm/pkg/server/debug/option.go
index 1fbc904654..e7ebae29fe 100644
--- a/idm/pkg/server/debug/option.go
+++ b/extensions/idm/pkg/server/debug/option.go
@@ -3,7 +3,7 @@ package debug
 import (
 	"context"
 
-	"github.com/owncloud/ocis/idm/pkg/config"
+	"github.com/owncloud/ocis/extensions/idm/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 
diff --git a/idm/pkg/server/debug/server.go b/extensions/idm/pkg/server/debug/server.go
similarity index 96%
rename from idm/pkg/server/debug/server.go
rename to extensions/idm/pkg/server/debug/server.go
index 426f95a623..af1160c2c6 100644
--- a/idm/pkg/server/debug/server.go
+++ b/extensions/idm/pkg/server/debug/server.go
@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/owncloud/ocis/idm/pkg/config"
+	"github.com/owncloud/ocis/extensions/idm/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/service/debug"
 	"github.com/owncloud/ocis/ocis-pkg/version"
 )
diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go
index 6c922efbd2..72649922b4 100644
--- a/ocis-pkg/config/config.go
+++ b/ocis-pkg/config/config.go
@@ -8,7 +8,7 @@ import (
 	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"
-	idm "github.com/owncloud/ocis/idm/pkg/config"
+	idm "github.com/owncloud/ocis/extensions/idm/pkg/config"
 	idp "github.com/owncloud/ocis/idp/pkg/config"
 	nats "github.com/owncloud/ocis/nats/pkg/config"
 	notifications "github.com/owncloud/ocis/notifications/pkg/config"
diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go
index 38cf5f6e1d..166cbdf007 100644
--- a/ocis-pkg/config/defaultconfig.go
+++ b/ocis-pkg/config/defaultconfig.go
@@ -6,7 +6,7 @@ import (
 	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"
-	idm "github.com/owncloud/ocis/idm/pkg/config/defaults"
+	idm "github.com/owncloud/ocis/extensions/idm/pkg/config/defaults"
 	idp "github.com/owncloud/ocis/idp/pkg/config/defaults"
 	nats "github.com/owncloud/ocis/nats/pkg/config/defaults"
 	notifications "github.com/owncloud/ocis/notifications/pkg/config/defaults"
diff --git a/ocis/pkg/command/idm.go b/ocis/pkg/command/idm.go
index fbfa4ba069..d768b6dc58 100644
--- a/ocis/pkg/command/idm.go
+++ b/ocis/pkg/command/idm.go
@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/idm/pkg/command"
+	"github.com/owncloud/ocis/extensions/idm/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/ocis/pkg/register"
diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go
index 91ba341883..317adbe2de 100644
--- a/ocis/pkg/runtime/service/service.go
+++ b/ocis/pkg/runtime/service/service.go
@@ -23,7 +23,7 @@ import (
 	glauth "github.com/owncloud/ocis/extensions/glauth/pkg/command"
 	graphExplorer "github.com/owncloud/ocis/extensions/graph-explorer/pkg/command"
 	graph "github.com/owncloud/ocis/extensions/graph/pkg/command"
-	idm "github.com/owncloud/ocis/idm/pkg/command"
+	idm "github.com/owncloud/ocis/extensions/idm/pkg/command"
 	idp "github.com/owncloud/ocis/idp/pkg/command"
 	nats "github.com/owncloud/ocis/nats/pkg/command"
 	notifications "github.com/owncloud/ocis/notifications/pkg/command"