diff --git a/nats/cmd/nats/main.go b/extensions/nats/cmd/nats/main.go
similarity index 52%
rename from nats/cmd/nats/main.go
rename to extensions/nats/cmd/nats/main.go
index a117af3cb..f0bab9d6a 100644
--- a/nats/cmd/nats/main.go
+++ b/extensions/nats/cmd/nats/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"github.com/owncloud/ocis/nats/pkg/command"
-	"github.com/owncloud/ocis/nats/pkg/config/defaults"
+	"github.com/owncloud/ocis/extensions/nats/pkg/command"
+	"github.com/owncloud/ocis/extensions/nats/pkg/config/defaults"
 )
 
 func main() {
diff --git a/nats/pkg/command/health.go b/extensions/nats/pkg/command/health.go
similarity index 85%
rename from nats/pkg/command/health.go
rename to extensions/nats/pkg/command/health.go
index e81307406..9a211848f 100644
--- a/nats/pkg/command/health.go
+++ b/extensions/nats/pkg/command/health.go
@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/nats/pkg/config"
+	"github.com/owncloud/ocis/extensions/nats/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/nats/pkg/command/root.go b/extensions/nats/pkg/command/root.go
similarity index 95%
rename from nats/pkg/command/root.go
rename to extensions/nats/pkg/command/root.go
index d21919a55..44e27d167 100644
--- a/nats/pkg/command/root.go
+++ b/extensions/nats/pkg/command/root.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"os"
 
-	"github.com/owncloud/ocis/nats/pkg/config"
+	"github.com/owncloud/ocis/extensions/nats/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/nats/pkg/command/server.go b/extensions/nats/pkg/command/server.go
similarity index 85%
rename from nats/pkg/command/server.go
rename to extensions/nats/pkg/command/server.go
index 8a46c2125..79f3f7f44 100644
--- a/nats/pkg/command/server.go
+++ b/extensions/nats/pkg/command/server.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/oklog/run"
 
-	"github.com/owncloud/ocis/nats/pkg/config"
-	"github.com/owncloud/ocis/nats/pkg/config/parser"
-	"github.com/owncloud/ocis/nats/pkg/logging"
-	"github.com/owncloud/ocis/nats/pkg/server/nats"
+	"github.com/owncloud/ocis/extensions/nats/pkg/config"
+	"github.com/owncloud/ocis/extensions/nats/pkg/config/parser"
+	"github.com/owncloud/ocis/extensions/nats/pkg/logging"
+	"github.com/owncloud/ocis/extensions/nats/pkg/server/nats"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/nats/pkg/command/version.go b/extensions/nats/pkg/command/version.go
similarity index 88%
rename from nats/pkg/command/version.go
rename to extensions/nats/pkg/command/version.go
index 0d29013b7..f310fc76a 100644
--- a/nats/pkg/command/version.go
+++ b/extensions/nats/pkg/command/version.go
@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/nats/pkg/config"
+	"github.com/owncloud/ocis/extensions/nats/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/nats/pkg/config/config.go b/extensions/nats/pkg/config/config.go
similarity index 100%
rename from nats/pkg/config/config.go
rename to extensions/nats/pkg/config/config.go
diff --git a/nats/pkg/config/debug.go b/extensions/nats/pkg/config/debug.go
similarity index 100%
rename from nats/pkg/config/debug.go
rename to extensions/nats/pkg/config/debug.go
diff --git a/nats/pkg/config/defaults/defaultconfig.go b/extensions/nats/pkg/config/defaults/defaultconfig.go
similarity index 95%
rename from nats/pkg/config/defaults/defaultconfig.go
rename to extensions/nats/pkg/config/defaults/defaultconfig.go
index d7a37996d..f9435ff4d 100644
--- a/nats/pkg/config/defaults/defaultconfig.go
+++ b/extensions/nats/pkg/config/defaults/defaultconfig.go
@@ -3,7 +3,7 @@ package defaults
 import (
 	"path"
 
-	"github.com/owncloud/ocis/nats/pkg/config"
+	"github.com/owncloud/ocis/extensions/nats/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
 )
 
diff --git a/nats/pkg/config/log.go b/extensions/nats/pkg/config/log.go
similarity index 100%
rename from nats/pkg/config/log.go
rename to extensions/nats/pkg/config/log.go
diff --git a/nats/pkg/config/parser/parse.go b/extensions/nats/pkg/config/parser/parse.go
similarity index 85%
rename from nats/pkg/config/parser/parse.go
rename to extensions/nats/pkg/config/parser/parse.go
index fb198fac2..2a427a3bd 100644
--- a/nats/pkg/config/parser/parse.go
+++ b/extensions/nats/pkg/config/parser/parse.go
@@ -3,8 +3,8 @@ package parser
 import (
 	"errors"
 
-	"github.com/owncloud/ocis/nats/pkg/config"
-	"github.com/owncloud/ocis/nats/pkg/config/defaults"
+	"github.com/owncloud/ocis/extensions/nats/pkg/config"
+	"github.com/owncloud/ocis/extensions/nats/pkg/config/defaults"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 
 	"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
diff --git a/nats/pkg/config/service.go b/extensions/nats/pkg/config/service.go
similarity index 100%
rename from nats/pkg/config/service.go
rename to extensions/nats/pkg/config/service.go
diff --git a/nats/pkg/logging/logging.go b/extensions/nats/pkg/logging/logging.go
similarity index 86%
rename from nats/pkg/logging/logging.go
rename to extensions/nats/pkg/logging/logging.go
index b60d2c9f9..9fe01c4ee 100644
--- a/nats/pkg/logging/logging.go
+++ b/extensions/nats/pkg/logging/logging.go
@@ -1,7 +1,7 @@
 package logging
 
 import (
-	"github.com/owncloud/ocis/nats/pkg/config"
+	"github.com/owncloud/ocis/extensions/nats/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 )
 
diff --git a/nats/pkg/logging/nats.go b/extensions/nats/pkg/logging/nats.go
similarity index 100%
rename from nats/pkg/logging/nats.go
rename to extensions/nats/pkg/logging/nats.go
diff --git a/nats/pkg/server/nats/nats.go b/extensions/nats/pkg/server/nats/nats.go
similarity index 100%
rename from nats/pkg/server/nats/nats.go
rename to extensions/nats/pkg/server/nats/nats.go
diff --git a/nats/pkg/server/nats/options.go b/extensions/nats/pkg/server/nats/options.go
similarity index 100%
rename from nats/pkg/server/nats/options.go
rename to extensions/nats/pkg/server/nats/options.go
diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go
index 23819967f..09433e5c3 100644
--- a/ocis-pkg/config/config.go
+++ b/ocis-pkg/config/config.go
@@ -10,7 +10,7 @@ import (
 	graph "github.com/owncloud/ocis/extensions/graph/pkg/config"
 	idm "github.com/owncloud/ocis/extensions/idm/pkg/config"
 	idp "github.com/owncloud/ocis/extensions/idp/pkg/config"
-	nats "github.com/owncloud/ocis/nats/pkg/config"
+	nats "github.com/owncloud/ocis/extensions/nats/pkg/config"
 	notifications "github.com/owncloud/ocis/notifications/pkg/config"
 	ocs "github.com/owncloud/ocis/ocs/pkg/config"
 	proxy "github.com/owncloud/ocis/proxy/pkg/config"
diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go
index 84cfb167a..787287790 100644
--- a/ocis-pkg/config/defaultconfig.go
+++ b/ocis-pkg/config/defaultconfig.go
@@ -8,7 +8,7 @@ import (
 	graph "github.com/owncloud/ocis/extensions/graph/pkg/config/defaults"
 	idm "github.com/owncloud/ocis/extensions/idm/pkg/config/defaults"
 	idp "github.com/owncloud/ocis/extensions/idp/pkg/config/defaults"
-	nats "github.com/owncloud/ocis/nats/pkg/config/defaults"
+	nats "github.com/owncloud/ocis/extensions/nats/pkg/config/defaults"
 	notifications "github.com/owncloud/ocis/notifications/pkg/config/defaults"
 	ocs "github.com/owncloud/ocis/ocs/pkg/config/defaults"
 	proxy "github.com/owncloud/ocis/proxy/pkg/config/defaults"
diff --git a/ocis/pkg/command/natsserver.go b/ocis/pkg/command/natsserver.go
index 165f61f0a..1e7f34323 100644
--- a/ocis/pkg/command/natsserver.go
+++ b/ocis/pkg/command/natsserver.go
@@ -1,7 +1,7 @@
 package command
 
 import (
-	"github.com/owncloud/ocis/nats/pkg/command"
+	"github.com/owncloud/ocis/extensions/nats/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 19dca5586..de569846e 100644
--- a/ocis/pkg/runtime/service/service.go
+++ b/ocis/pkg/runtime/service/service.go
@@ -25,7 +25,7 @@ import (
 	graph "github.com/owncloud/ocis/extensions/graph/pkg/command"
 	idm "github.com/owncloud/ocis/extensions/idm/pkg/command"
 	idp "github.com/owncloud/ocis/extensions/idp/pkg/command"
-	nats "github.com/owncloud/ocis/nats/pkg/command"
+	nats "github.com/owncloud/ocis/extensions/nats/pkg/command"
 	notifications "github.com/owncloud/ocis/notifications/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"