From afea0b430467733ac2969c67293688f04e782bfa Mon Sep 17 00:00:00 2001
From: Christian Richter <crichter@owncloud.com>
Date: Wed, 13 Apr 2022 11:20:54 +0200
Subject: [PATCH] refactor webdav

Signed-off-by: Christian Richter <crichter@owncloud.com>
---
 {webdav => extensions/webdav}/.dockerignore        |  0
 {webdav => extensions/webdav}/Makefile             | 12 ++++++------
 {webdav => extensions/webdav}/cmd/webdav/main.go   |  4 ++--
 {webdav => extensions/webdav}/config/.gitignore    |  0
 .../webdav}/docker/Dockerfile.linux.amd64          |  0
 .../webdav}/docker/Dockerfile.linux.arm            |  0
 .../webdav}/docker/Dockerfile.linux.arm64          |  0
 {webdav => extensions/webdav}/docker/manifest.tmpl |  0
 .../webdav}/pkg/command/health.go                  |  6 +++---
 {webdav => extensions/webdav}/pkg/command/root.go  |  2 +-
 .../webdav}/pkg/command/server.go                  | 14 +++++++-------
 .../webdav}/pkg/command/version.go                 |  2 +-
 {webdav => extensions/webdav}/pkg/config/config.go |  0
 {webdav => extensions/webdav}/pkg/config/debug.go  |  0
 .../webdav}/pkg/config/defaults/defaultconfig.go   |  2 +-
 {webdav => extensions/webdav}/pkg/config/http.go   |  0
 {webdav => extensions/webdav}/pkg/config/log.go    |  0
 .../webdav}/pkg/config/parser/parse.go             |  4 ++--
 .../webdav}/pkg/config/service.go                  |  0
 .../webdav}/pkg/config/tracing.go                  |  0
 .../webdav}/pkg/dav/requests/thumbnail.go          |  0
 .../webdav}/pkg/logging/logging.go                 |  2 +-
 .../webdav}/pkg/metrics/metrics.go                 |  0
 .../webdav}/pkg/server/debug/option.go             |  2 +-
 .../webdav}/pkg/server/debug/server.go             |  2 +-
 .../webdav}/pkg/server/http/option.go              |  4 ++--
 .../webdav}/pkg/server/http/server.go              |  2 +-
 .../webdav}/pkg/service/v0/instrument.go           |  2 +-
 .../webdav}/pkg/service/v0/logging.go              |  0
 .../webdav}/pkg/service/v0/option.go               |  2 +-
 .../webdav}/pkg/service/v0/service.go              |  4 ++--
 .../webdav}/pkg/service/v0/tracing.go              |  0
 .../webdav}/pkg/tracing/tracing.go                 |  2 +-
 {webdav => extensions/webdav}/reflex.conf          |  0
 ocis-pkg/config/config.go                          |  2 +-
 ocis-pkg/config/defaultconfig.go                   |  2 +-
 ocis/pkg/command/webdav.go                         |  2 +-
 ocis/pkg/runtime/service/service.go                |  2 +-
 38 files changed, 38 insertions(+), 38 deletions(-)
 rename {webdav => extensions/webdav}/.dockerignore (100%)
 rename {webdav => extensions/webdav}/Makefile (78%)
 rename {webdav => extensions/webdav}/cmd/webdav/main.go (51%)
 rename {webdav => extensions/webdav}/config/.gitignore (100%)
 rename {webdav => extensions/webdav}/docker/Dockerfile.linux.amd64 (100%)
 rename {webdav => extensions/webdav}/docker/Dockerfile.linux.arm (100%)
 rename {webdav => extensions/webdav}/docker/Dockerfile.linux.arm64 (100%)
 rename {webdav => extensions/webdav}/docker/manifest.tmpl (100%)
 rename {webdav => extensions/webdav}/pkg/command/health.go (84%)
 rename {webdav => extensions/webdav}/pkg/command/root.go (95%)
 rename {webdav => extensions/webdav}/pkg/command/server.go (82%)
 rename {webdav => extensions/webdav}/pkg/command/version.go (95%)
 rename {webdav => extensions/webdav}/pkg/config/config.go (100%)
 rename {webdav => extensions/webdav}/pkg/config/debug.go (100%)
 rename {webdav => extensions/webdav}/pkg/config/defaults/defaultconfig.go (97%)
 rename {webdav => extensions/webdav}/pkg/config/http.go (100%)
 rename {webdav => extensions/webdav}/pkg/config/log.go (100%)
 rename {webdav => extensions/webdav}/pkg/config/parser/parse.go (84%)
 rename {webdav => extensions/webdav}/pkg/config/service.go (100%)
 rename {webdav => extensions/webdav}/pkg/config/tracing.go (100%)
 rename {webdav => extensions/webdav}/pkg/dav/requests/thumbnail.go (100%)
 rename {webdav => extensions/webdav}/pkg/logging/logging.go (85%)
 rename {webdav => extensions/webdav}/pkg/metrics/metrics.go (100%)
 rename {webdav => extensions/webdav}/pkg/server/debug/option.go (94%)
 rename {webdav => extensions/webdav}/pkg/server/debug/server.go (97%)
 rename {webdav => extensions/webdav}/pkg/server/http/option.go (92%)
 rename {webdav => extensions/webdav}/pkg/server/http/server.go (96%)
 rename {webdav => extensions/webdav}/pkg/service/v0/instrument.go (91%)
 rename {webdav => extensions/webdav}/pkg/service/v0/logging.go (100%)
 rename {webdav => extensions/webdav}/pkg/service/v0/option.go (94%)
 rename {webdav => extensions/webdav}/pkg/service/v0/service.go (98%)
 rename {webdav => extensions/webdav}/pkg/service/v0/tracing.go (100%)
 rename {webdav => extensions/webdav}/pkg/tracing/tracing.go (89%)
 rename {webdav => extensions/webdav}/reflex.conf (100%)

diff --git a/webdav/.dockerignore b/extensions/webdav/.dockerignore
similarity index 100%
rename from webdav/.dockerignore
rename to extensions/webdav/.dockerignore
diff --git a/webdav/Makefile b/extensions/webdav/Makefile
similarity index 78%
rename from webdav/Makefile
rename to extensions/webdav/Makefile
index 87ceace390..c6418420a7 100644
--- a/webdav/Makefile
+++ b/extensions/webdav/Makefile
@@ -1,27 +1,27 @@
 SHELL := bash
 NAME := webdav
 
-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/webdav/cmd/webdav/main.go b/extensions/webdav/cmd/webdav/main.go
similarity index 51%
rename from webdav/cmd/webdav/main.go
rename to extensions/webdav/cmd/webdav/main.go
index 88b1185d71..0a65c6442f 100644
--- a/webdav/cmd/webdav/main.go
+++ b/extensions/webdav/cmd/webdav/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"github.com/owncloud/ocis/webdav/pkg/command"
-	"github.com/owncloud/ocis/webdav/pkg/config/defaults"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/command"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config/defaults"
 )
 
 func main() {
diff --git a/webdav/config/.gitignore b/extensions/webdav/config/.gitignore
similarity index 100%
rename from webdav/config/.gitignore
rename to extensions/webdav/config/.gitignore
diff --git a/webdav/docker/Dockerfile.linux.amd64 b/extensions/webdav/docker/Dockerfile.linux.amd64
similarity index 100%
rename from webdav/docker/Dockerfile.linux.amd64
rename to extensions/webdav/docker/Dockerfile.linux.amd64
diff --git a/webdav/docker/Dockerfile.linux.arm b/extensions/webdav/docker/Dockerfile.linux.arm
similarity index 100%
rename from webdav/docker/Dockerfile.linux.arm
rename to extensions/webdav/docker/Dockerfile.linux.arm
diff --git a/webdav/docker/Dockerfile.linux.arm64 b/extensions/webdav/docker/Dockerfile.linux.arm64
similarity index 100%
rename from webdav/docker/Dockerfile.linux.arm64
rename to extensions/webdav/docker/Dockerfile.linux.arm64
diff --git a/webdav/docker/manifest.tmpl b/extensions/webdav/docker/manifest.tmpl
similarity index 100%
rename from webdav/docker/manifest.tmpl
rename to extensions/webdav/docker/manifest.tmpl
diff --git a/webdav/pkg/command/health.go b/extensions/webdav/pkg/command/health.go
similarity index 84%
rename from webdav/pkg/command/health.go
rename to extensions/webdav/pkg/command/health.go
index 94741b29a7..d6226f8e8f 100644
--- a/webdav/pkg/command/health.go
+++ b/extensions/webdav/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/owncloud/ocis/webdav/pkg/config"
-	"github.com/owncloud/ocis/webdav/pkg/config/parser"
-	"github.com/owncloud/ocis/webdav/pkg/logging"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config/parser"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/logging"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/webdav/pkg/command/root.go b/extensions/webdav/pkg/command/root.go
similarity index 95%
rename from webdav/pkg/command/root.go
rename to extensions/webdav/pkg/command/root.go
index 3a3a3432bd..fe2a7f3c20 100644
--- a/webdav/pkg/command/root.go
+++ b/extensions/webdav/pkg/command/root.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"os"
 
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/clihelper"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/owncloud/ocis/webdav/pkg/config"
 	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
diff --git a/webdav/pkg/command/server.go b/extensions/webdav/pkg/command/server.go
similarity index 82%
rename from webdav/pkg/command/server.go
rename to extensions/webdav/pkg/command/server.go
index 3511d326c8..291276cbbe 100644
--- a/webdav/pkg/command/server.go
+++ b/extensions/webdav/pkg/command/server.go
@@ -5,14 +5,14 @@ import (
 	"fmt"
 
 	"github.com/oklog/run"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config/parser"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/logging"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/metrics"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/server/debug"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/server/http"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/tracing"
 	"github.com/owncloud/ocis/ocis-pkg/version"
-	"github.com/owncloud/ocis/webdav/pkg/config"
-	"github.com/owncloud/ocis/webdav/pkg/config/parser"
-	"github.com/owncloud/ocis/webdav/pkg/logging"
-	"github.com/owncloud/ocis/webdav/pkg/metrics"
-	"github.com/owncloud/ocis/webdav/pkg/server/debug"
-	"github.com/owncloud/ocis/webdav/pkg/server/http"
-	"github.com/owncloud/ocis/webdav/pkg/tracing"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/webdav/pkg/command/version.go b/extensions/webdav/pkg/command/version.go
similarity index 95%
rename from webdav/pkg/command/version.go
rename to extensions/webdav/pkg/command/version.go
index 71b5b0d452..b456847089 100644
--- a/webdav/pkg/command/version.go
+++ b/extensions/webdav/pkg/command/version.go
@@ -8,7 +8,7 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/version"
 
 	tw "github.com/olekukonko/tablewriter"
-	"github.com/owncloud/ocis/webdav/pkg/config"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/webdav/pkg/config/config.go b/extensions/webdav/pkg/config/config.go
similarity index 100%
rename from webdav/pkg/config/config.go
rename to extensions/webdav/pkg/config/config.go
diff --git a/webdav/pkg/config/debug.go b/extensions/webdav/pkg/config/debug.go
similarity index 100%
rename from webdav/pkg/config/debug.go
rename to extensions/webdav/pkg/config/debug.go
diff --git a/webdav/pkg/config/defaults/defaultconfig.go b/extensions/webdav/pkg/config/defaults/defaultconfig.go
similarity index 97%
rename from webdav/pkg/config/defaults/defaultconfig.go
rename to extensions/webdav/pkg/config/defaults/defaultconfig.go
index 8c2e164703..48e00e17f1 100644
--- a/webdav/pkg/config/defaults/defaultconfig.go
+++ b/extensions/webdav/pkg/config/defaults/defaultconfig.go
@@ -3,7 +3,7 @@ package defaults
 import (
 	"strings"
 
-	"github.com/owncloud/ocis/webdav/pkg/config"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
 )
 
 func FullDefaultConfig() *config.Config {
diff --git a/webdav/pkg/config/http.go b/extensions/webdav/pkg/config/http.go
similarity index 100%
rename from webdav/pkg/config/http.go
rename to extensions/webdav/pkg/config/http.go
diff --git a/webdav/pkg/config/log.go b/extensions/webdav/pkg/config/log.go
similarity index 100%
rename from webdav/pkg/config/log.go
rename to extensions/webdav/pkg/config/log.go
diff --git a/webdav/pkg/config/parser/parse.go b/extensions/webdav/pkg/config/parser/parse.go
similarity index 84%
rename from webdav/pkg/config/parser/parse.go
rename to extensions/webdav/pkg/config/parser/parse.go
index 629f85220e..7597255f9c 100644
--- a/webdav/pkg/config/parser/parse.go
+++ b/extensions/webdav/pkg/config/parser/parse.go
@@ -3,9 +3,9 @@ package parser
 import (
 	"errors"
 
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config/defaults"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/owncloud/ocis/webdav/pkg/config"
-	"github.com/owncloud/ocis/webdav/pkg/config/defaults"
 
 	"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
 )
diff --git a/webdav/pkg/config/service.go b/extensions/webdav/pkg/config/service.go
similarity index 100%
rename from webdav/pkg/config/service.go
rename to extensions/webdav/pkg/config/service.go
diff --git a/webdav/pkg/config/tracing.go b/extensions/webdav/pkg/config/tracing.go
similarity index 100%
rename from webdav/pkg/config/tracing.go
rename to extensions/webdav/pkg/config/tracing.go
diff --git a/webdav/pkg/dav/requests/thumbnail.go b/extensions/webdav/pkg/dav/requests/thumbnail.go
similarity index 100%
rename from webdav/pkg/dav/requests/thumbnail.go
rename to extensions/webdav/pkg/dav/requests/thumbnail.go
diff --git a/webdav/pkg/logging/logging.go b/extensions/webdav/pkg/logging/logging.go
similarity index 85%
rename from webdav/pkg/logging/logging.go
rename to extensions/webdav/pkg/logging/logging.go
index ff82b1f6bf..454e207cf6 100644
--- a/webdav/pkg/logging/logging.go
+++ b/extensions/webdav/pkg/logging/logging.go
@@ -1,8 +1,8 @@
 package logging
 
 import (
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/webdav/pkg/config"
 )
 
 // LoggerFromConfig initializes a service-specific logger instance.
diff --git a/webdav/pkg/metrics/metrics.go b/extensions/webdav/pkg/metrics/metrics.go
similarity index 100%
rename from webdav/pkg/metrics/metrics.go
rename to extensions/webdav/pkg/metrics/metrics.go
diff --git a/webdav/pkg/server/debug/option.go b/extensions/webdav/pkg/server/debug/option.go
similarity index 94%
rename from webdav/pkg/server/debug/option.go
rename to extensions/webdav/pkg/server/debug/option.go
index a85cd18c91..629ebebcdb 100644
--- a/webdav/pkg/server/debug/option.go
+++ b/extensions/webdav/pkg/server/debug/option.go
@@ -3,8 +3,8 @@ package debug
 import (
 	"context"
 
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/webdav/pkg/config"
 )
 
 // Option defines a single option function.
diff --git a/webdav/pkg/server/debug/server.go b/extensions/webdav/pkg/server/debug/server.go
similarity index 97%
rename from webdav/pkg/server/debug/server.go
rename to extensions/webdav/pkg/server/debug/server.go
index ff0ee6b4fe..a17e167528 100644
--- a/webdav/pkg/server/debug/server.go
+++ b/extensions/webdav/pkg/server/debug/server.go
@@ -4,9 +4,9 @@ import (
 	"io"
 	"net/http"
 
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/service/debug"
 	"github.com/owncloud/ocis/ocis-pkg/version"
-	"github.com/owncloud/ocis/webdav/pkg/config"
 )
 
 // Server initializes the debug service and server.
diff --git a/webdav/pkg/server/http/option.go b/extensions/webdav/pkg/server/http/option.go
similarity index 92%
rename from webdav/pkg/server/http/option.go
rename to extensions/webdav/pkg/server/http/option.go
index f18d3faf02..352d103cf4 100644
--- a/webdav/pkg/server/http/option.go
+++ b/extensions/webdav/pkg/server/http/option.go
@@ -3,9 +3,9 @@ package http
 import (
 	"context"
 
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/metrics"
 	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/webdav/pkg/config"
-	"github.com/owncloud/ocis/webdav/pkg/metrics"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/webdav/pkg/server/http/server.go b/extensions/webdav/pkg/server/http/server.go
similarity index 96%
rename from webdav/pkg/server/http/server.go
rename to extensions/webdav/pkg/server/http/server.go
index 029245bbac..c23a5516e7 100644
--- a/webdav/pkg/server/http/server.go
+++ b/extensions/webdav/pkg/server/http/server.go
@@ -2,11 +2,11 @@ package http
 
 import (
 	chimiddleware "github.com/go-chi/chi/v5/middleware"
+	svc "github.com/owncloud/ocis/extensions/webdav/pkg/service/v0"
 	"github.com/owncloud/ocis/ocis-pkg/cors"
 	"github.com/owncloud/ocis/ocis-pkg/middleware"
 	"github.com/owncloud/ocis/ocis-pkg/service/http"
 	"github.com/owncloud/ocis/ocis-pkg/version"
-	svc "github.com/owncloud/ocis/webdav/pkg/service/v0"
 	"go-micro.dev/v4"
 )
 
diff --git a/webdav/pkg/service/v0/instrument.go b/extensions/webdav/pkg/service/v0/instrument.go
similarity index 91%
rename from webdav/pkg/service/v0/instrument.go
rename to extensions/webdav/pkg/service/v0/instrument.go
index 4f5d6cb949..d476f36302 100644
--- a/webdav/pkg/service/v0/instrument.go
+++ b/extensions/webdav/pkg/service/v0/instrument.go
@@ -3,7 +3,7 @@ package svc
 import (
 	"net/http"
 
-	"github.com/owncloud/ocis/webdav/pkg/metrics"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/metrics"
 )
 
 // NewInstrument returns a service that instruments metrics.
diff --git a/webdav/pkg/service/v0/logging.go b/extensions/webdav/pkg/service/v0/logging.go
similarity index 100%
rename from webdav/pkg/service/v0/logging.go
rename to extensions/webdav/pkg/service/v0/logging.go
diff --git a/webdav/pkg/service/v0/option.go b/extensions/webdav/pkg/service/v0/option.go
similarity index 94%
rename from webdav/pkg/service/v0/option.go
rename to extensions/webdav/pkg/service/v0/option.go
index bd689c3e6e..e1e88b2cf2 100644
--- a/webdav/pkg/service/v0/option.go
+++ b/extensions/webdav/pkg/service/v0/option.go
@@ -3,8 +3,8 @@ package svc
 import (
 	"net/http"
 
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/webdav/pkg/config"
 )
 
 // Option defines a single option function.
diff --git a/webdav/pkg/service/v0/service.go b/extensions/webdav/pkg/service/v0/service.go
similarity index 98%
rename from webdav/pkg/service/v0/service.go
rename to extensions/webdav/pkg/service/v0/service.go
index c98a3b3afd..747bafbace 100644
--- a/webdav/pkg/service/v0/service.go
+++ b/extensions/webdav/pkg/service/v0/service.go
@@ -20,10 +20,10 @@ import (
 	"github.com/owncloud/ocis/ocis-pkg/service/grpc"
 
 	"github.com/go-chi/chi/v5"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
+	"github.com/owncloud/ocis/extensions/webdav/pkg/dav/requests"
 	thumbnailsmsg "github.com/owncloud/ocis/protogen/gen/ocis/messages/thumbnails/v0"
 	thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0"
-	"github.com/owncloud/ocis/webdav/pkg/config"
-	"github.com/owncloud/ocis/webdav/pkg/dav/requests"
 )
 
 const (
diff --git a/webdav/pkg/service/v0/tracing.go b/extensions/webdav/pkg/service/v0/tracing.go
similarity index 100%
rename from webdav/pkg/service/v0/tracing.go
rename to extensions/webdav/pkg/service/v0/tracing.go
diff --git a/webdav/pkg/tracing/tracing.go b/extensions/webdav/pkg/tracing/tracing.go
similarity index 89%
rename from webdav/pkg/tracing/tracing.go
rename to extensions/webdav/pkg/tracing/tracing.go
index 8a2c539291..2412c73662 100644
--- a/webdav/pkg/tracing/tracing.go
+++ b/extensions/webdav/pkg/tracing/tracing.go
@@ -1,8 +1,8 @@
 package tracing
 
 import (
+	"github.com/owncloud/ocis/extensions/webdav/pkg/config"
 	pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
-	"github.com/owncloud/ocis/webdav/pkg/config"
 	"go.opentelemetry.io/otel/trace"
 )
 
diff --git a/webdav/reflex.conf b/extensions/webdav/reflex.conf
similarity index 100%
rename from webdav/reflex.conf
rename to extensions/webdav/reflex.conf
diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go
index 4e4dd35ee7..f687f7befd 100644
--- a/ocis-pkg/config/config.go
+++ b/ocis-pkg/config/config.go
@@ -18,8 +18,8 @@ import (
 	storage "github.com/owncloud/ocis/extensions/storage/pkg/config"
 	store "github.com/owncloud/ocis/extensions/store/pkg/config"
 	web "github.com/owncloud/ocis/extensions/web/pkg/config"
+	webdav "github.com/owncloud/ocis/extensions/webdav/pkg/config"
 	thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config"
-	webdav "github.com/owncloud/ocis/webdav/pkg/config"
 )
 
 // TokenManager is the config for using the reva token manager
diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go
index 2325d43847..519f803e0f 100644
--- a/ocis-pkg/config/defaultconfig.go
+++ b/ocis-pkg/config/defaultconfig.go
@@ -16,8 +16,8 @@ import (
 	storage "github.com/owncloud/ocis/extensions/storage/pkg/config/defaults"
 	store "github.com/owncloud/ocis/extensions/store/pkg/config/defaults"
 	web "github.com/owncloud/ocis/extensions/web/pkg/config/defaults"
+	webdav "github.com/owncloud/ocis/extensions/webdav/pkg/config/defaults"
 	thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config/defaults"
-	webdav "github.com/owncloud/ocis/webdav/pkg/config/defaults"
 )
 
 func DefaultConfig() *Config {
diff --git a/ocis/pkg/command/webdav.go b/ocis/pkg/command/webdav.go
index f09b59a13c..7add32497f 100644
--- a/ocis/pkg/command/webdav.go
+++ b/ocis/pkg/command/webdav.go
@@ -1,10 +1,10 @@
 package command
 
 import (
+	"github.com/owncloud/ocis/extensions/webdav/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/config/parser"
 	"github.com/owncloud/ocis/ocis/pkg/register"
-	"github.com/owncloud/ocis/webdav/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go
index e858af2834..a88c986350 100644
--- a/ocis/pkg/runtime/service/service.go
+++ b/ocis/pkg/runtime/service/service.go
@@ -33,11 +33,11 @@ import (
 	storage "github.com/owncloud/ocis/extensions/storage/pkg/command"
 	store "github.com/owncloud/ocis/extensions/store/pkg/command"
 	web "github.com/owncloud/ocis/extensions/web/pkg/command"
+	webdav "github.com/owncloud/ocis/extensions/webdav/pkg/command"
 	"github.com/owncloud/ocis/ocis-pkg/config"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
 	thumbnails "github.com/owncloud/ocis/thumbnails/pkg/command"
-	webdav "github.com/owncloud/ocis/webdav/pkg/command"
 	"github.com/rs/zerolog"
 	"github.com/thejerf/suture/v4"
 	"go-micro.dev/v4/logger"