From e5abc25aa15fc1d929cd6add8c4154aad37b5a30 Mon Sep 17 00:00:00 2001
From: Christian Richter <crichter@owncloud.com>
Date: Wed, 13 Apr 2022 11:16:49 +0200
Subject: [PATCH] refactor web

Signed-off-by: Christian Richter <crichter@owncloud.com>
---
 {web => extensions/web}/.dockerignore              |  0
 {web => extensions/web}/Makefile                   | 12 ++++++------
 {web => extensions/web}/assets/.keep               |  0
 {web => extensions/web}/cmd/web/main.go            |  4 ++--
 .../web}/docker/Dockerfile.linux.amd64             |  0
 .../web}/docker/Dockerfile.linux.arm               |  0
 .../web}/docker/Dockerfile.linux.arm64             |  0
 {web => extensions/web}/docker/manifest.tmpl       |  0
 {web => extensions/web}/pkg/assets/option.go       |  4 ++--
 {web => extensions/web}/pkg/assets/server.go       |  0
 {web => extensions/web}/pkg/command/health.go      |  6 +++---
 {web => extensions/web}/pkg/command/root.go        |  2 +-
 {web => extensions/web}/pkg/command/server.go      | 14 +++++++-------
 {web => extensions/web}/pkg/command/version.go     |  2 +-
 {web => extensions/web}/pkg/config/config.go       |  0
 {web => extensions/web}/pkg/config/debug.go        |  0
 .../web}/pkg/config/defaults/defaultconfig.go      |  2 +-
 {web => extensions/web}/pkg/config/http.go         |  0
 {web => extensions/web}/pkg/config/log.go          |  0
 {web => extensions/web}/pkg/config/parser/parse.go |  4 ++--
 {web => extensions/web}/pkg/config/service.go      |  0
 {web => extensions/web}/pkg/config/tracing.go      |  0
 {web => extensions/web}/pkg/logging/logging.go     |  2 +-
 {web => extensions/web}/pkg/metrics/metrics.go     |  0
 .../web}/pkg/middleware/silentrefresh.go           |  0
 {web => extensions/web}/pkg/server/debug/option.go |  2 +-
 {web => extensions/web}/pkg/server/debug/server.go |  2 +-
 {web => extensions/web}/pkg/server/http/option.go  |  4 ++--
 {web => extensions/web}/pkg/server/http/server.go  |  4 ++--
 .../web}/pkg/service/v0/instrument.go              |  2 +-
 {web => extensions/web}/pkg/service/v0/logging.go  |  0
 {web => extensions/web}/pkg/service/v0/option.go   |  2 +-
 {web => extensions/web}/pkg/service/v0/service.go  |  4 ++--
 {web => extensions/web}/pkg/service/v0/tracing.go  |  0
 {web => extensions/web}/pkg/tracing/tracing.go     |  2 +-
 {web => extensions/web}/reflex.conf                |  0
 {web => extensions/web}/web.go                     |  0
 ocis-pkg/config/config.go                          |  2 +-
 ocis-pkg/config/defaultconfig.go                   |  2 +-
 ocis/pkg/command/web.go                            |  2 +-
 ocis/pkg/runtime/service/service.go                |  2 +-
 41 files changed, 41 insertions(+), 41 deletions(-)
 rename {web => extensions/web}/.dockerignore (100%)
 rename {web => extensions/web}/Makefile (86%)
 rename {web => extensions/web}/assets/.keep (100%)
 rename {web => extensions/web}/cmd/web/main.go (52%)
 rename {web => extensions/web}/docker/Dockerfile.linux.amd64 (100%)
 rename {web => extensions/web}/docker/Dockerfile.linux.arm (100%)
 rename {web => extensions/web}/docker/Dockerfile.linux.arm64 (100%)
 rename {web => extensions/web}/docker/manifest.tmpl (100%)
 rename {web => extensions/web}/pkg/assets/option.go (91%)
 rename {web => extensions/web}/pkg/assets/server.go (100%)
 rename {web => extensions/web}/pkg/command/health.go (84%)
 rename {web => extensions/web}/pkg/command/root.go (96%)
 rename {web => extensions/web}/pkg/command/server.go (85%)
 rename {web => extensions/web}/pkg/command/version.go (96%)
 rename {web => extensions/web}/pkg/config/config.go (100%)
 rename {web => extensions/web}/pkg/config/debug.go (100%)
 rename {web => extensions/web}/pkg/config/defaults/defaultconfig.go (97%)
 rename {web => extensions/web}/pkg/config/http.go (100%)
 rename {web => extensions/web}/pkg/config/log.go (100%)
 rename {web => extensions/web}/pkg/config/parser/parse.go (85%)
 rename {web => extensions/web}/pkg/config/service.go (100%)
 rename {web => extensions/web}/pkg/config/tracing.go (100%)
 rename {web => extensions/web}/pkg/logging/logging.go (86%)
 rename {web => extensions/web}/pkg/metrics/metrics.go (100%)
 rename {web => extensions/web}/pkg/middleware/silentrefresh.go (100%)
 rename {web => extensions/web}/pkg/server/debug/option.go (94%)
 rename {web => extensions/web}/pkg/server/debug/server.go (96%)
 rename {web => extensions/web}/pkg/server/http/option.go (93%)
 rename {web => extensions/web}/pkg/server/http/server.go (90%)
 rename {web => extensions/web}/pkg/service/v0/instrument.go (91%)
 rename {web => extensions/web}/pkg/service/v0/logging.go (100%)
 rename {web => extensions/web}/pkg/service/v0/option.go (94%)
 rename {web => extensions/web}/pkg/service/v0/service.go (97%)
 rename {web => extensions/web}/pkg/service/v0/tracing.go (100%)
 rename {web => extensions/web}/pkg/tracing/tracing.go (90%)
 rename {web => extensions/web}/reflex.conf (100%)
 rename {web => extensions/web}/web.go (100%)

diff --git a/web/.dockerignore b/extensions/web/.dockerignore
similarity index 100%
rename from web/.dockerignore
rename to extensions/web/.dockerignore
diff --git a/web/Makefile b/extensions/web/Makefile
similarity index 86%
rename from web/Makefile
rename to extensions/web/Makefile
index d8a2766e0..39bfce1fe 100644
--- a/web/Makefile
+++ b/extensions/web/Makefile
@@ -2,27 +2,27 @@ SHELL := bash
 NAME := web
 WEB_ASSETS_VERSION = v5.4.0
 
-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/web/assets/.keep b/extensions/web/assets/.keep
similarity index 100%
rename from web/assets/.keep
rename to extensions/web/assets/.keep
diff --git a/web/cmd/web/main.go b/extensions/web/cmd/web/main.go
similarity index 52%
rename from web/cmd/web/main.go
rename to extensions/web/cmd/web/main.go
index f46816b8c..cde38ffee 100644
--- a/web/cmd/web/main.go
+++ b/extensions/web/cmd/web/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"github.com/owncloud/ocis/web/pkg/command"
-	"github.com/owncloud/ocis/web/pkg/config/defaults"
+	"github.com/owncloud/ocis/extensions/web/pkg/command"
+	"github.com/owncloud/ocis/extensions/web/pkg/config/defaults"
 )
 
 func main() {
diff --git a/web/docker/Dockerfile.linux.amd64 b/extensions/web/docker/Dockerfile.linux.amd64
similarity index 100%
rename from web/docker/Dockerfile.linux.amd64
rename to extensions/web/docker/Dockerfile.linux.amd64
diff --git a/web/docker/Dockerfile.linux.arm b/extensions/web/docker/Dockerfile.linux.arm
similarity index 100%
rename from web/docker/Dockerfile.linux.arm
rename to extensions/web/docker/Dockerfile.linux.arm
diff --git a/web/docker/Dockerfile.linux.arm64 b/extensions/web/docker/Dockerfile.linux.arm64
similarity index 100%
rename from web/docker/Dockerfile.linux.arm64
rename to extensions/web/docker/Dockerfile.linux.arm64
diff --git a/web/docker/manifest.tmpl b/extensions/web/docker/manifest.tmpl
similarity index 100%
rename from web/docker/manifest.tmpl
rename to extensions/web/docker/manifest.tmpl
diff --git a/web/pkg/assets/option.go b/extensions/web/pkg/assets/option.go
similarity index 91%
rename from web/pkg/assets/option.go
rename to extensions/web/pkg/assets/option.go
index 233ca8435..0112dab59 100644
--- a/web/pkg/assets/option.go
+++ b/extensions/web/pkg/assets/option.go
@@ -3,10 +3,10 @@ package assets
 import (
 	"net/http"
 
+	"github.com/owncloud/ocis/extensions/web"
+	"github.com/owncloud/ocis/extensions/web/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/assetsfs"
 	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/web"
-	"github.com/owncloud/ocis/web/pkg/config"
 )
 
 // New returns a new http filesystem to serve assets.
diff --git a/web/pkg/assets/server.go b/extensions/web/pkg/assets/server.go
similarity index 100%
rename from web/pkg/assets/server.go
rename to extensions/web/pkg/assets/server.go
diff --git a/web/pkg/command/health.go b/extensions/web/pkg/command/health.go
similarity index 84%
rename from web/pkg/command/health.go
rename to extensions/web/pkg/command/health.go
index 38713676a..397f14da4 100644
--- a/web/pkg/command/health.go
+++ b/extensions/web/pkg/command/health.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/owncloud/ocis/web/pkg/config"
-	"github.com/owncloud/ocis/web/pkg/config/parser"
-	"github.com/owncloud/ocis/web/pkg/logging"
+	"github.com/owncloud/ocis/extensions/web/pkg/config"
+	"github.com/owncloud/ocis/extensions/web/pkg/config/parser"
+	"github.com/owncloud/ocis/extensions/web/pkg/logging"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/web/pkg/command/root.go b/extensions/web/pkg/command/root.go
similarity index 96%
rename from web/pkg/command/root.go
rename to extensions/web/pkg/command/root.go
index 2dbe61c1b..ce1b7b693 100644
--- a/web/pkg/command/root.go
+++ b/extensions/web/pkg/command/root.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"os"
 
+	"github.com/owncloud/ocis/extensions/web/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/clihelper"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/owncloud/ocis/web/pkg/config"
 	"github.com/thejerf/suture/v4"
 	"github.com/urfave/cli/v2"
 )
diff --git a/web/pkg/command/server.go b/extensions/web/pkg/command/server.go
similarity index 85%
rename from web/pkg/command/server.go
rename to extensions/web/pkg/command/server.go
index f68d16a5d..e62494d07 100644
--- a/web/pkg/command/server.go
+++ b/extensions/web/pkg/command/server.go
@@ -7,13 +7,13 @@ import (
 	"io/ioutil"
 
 	"github.com/oklog/run"
-	"github.com/owncloud/ocis/web/pkg/config"
-	"github.com/owncloud/ocis/web/pkg/config/parser"
-	"github.com/owncloud/ocis/web/pkg/logging"
-	"github.com/owncloud/ocis/web/pkg/metrics"
-	"github.com/owncloud/ocis/web/pkg/server/debug"
-	"github.com/owncloud/ocis/web/pkg/server/http"
-	"github.com/owncloud/ocis/web/pkg/tracing"
+	"github.com/owncloud/ocis/extensions/web/pkg/config"
+	"github.com/owncloud/ocis/extensions/web/pkg/config/parser"
+	"github.com/owncloud/ocis/extensions/web/pkg/logging"
+	"github.com/owncloud/ocis/extensions/web/pkg/metrics"
+	"github.com/owncloud/ocis/extensions/web/pkg/server/debug"
+	"github.com/owncloud/ocis/extensions/web/pkg/server/http"
+	"github.com/owncloud/ocis/extensions/web/pkg/tracing"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/web/pkg/command/version.go b/extensions/web/pkg/command/version.go
similarity index 96%
rename from web/pkg/command/version.go
rename to extensions/web/pkg/command/version.go
index 783dd284e..121572ceb 100644
--- a/web/pkg/command/version.go
+++ b/extensions/web/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/web/pkg/config"
+	"github.com/owncloud/ocis/extensions/web/pkg/config"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/web/pkg/config/config.go b/extensions/web/pkg/config/config.go
similarity index 100%
rename from web/pkg/config/config.go
rename to extensions/web/pkg/config/config.go
diff --git a/web/pkg/config/debug.go b/extensions/web/pkg/config/debug.go
similarity index 100%
rename from web/pkg/config/debug.go
rename to extensions/web/pkg/config/debug.go
diff --git a/web/pkg/config/defaults/defaultconfig.go b/extensions/web/pkg/config/defaults/defaultconfig.go
similarity index 97%
rename from web/pkg/config/defaults/defaultconfig.go
rename to extensions/web/pkg/config/defaults/defaultconfig.go
index d61321a7e..bbfad9bdf 100644
--- a/web/pkg/config/defaults/defaultconfig.go
+++ b/extensions/web/pkg/config/defaults/defaultconfig.go
@@ -3,7 +3,7 @@ package defaults
 import (
 	"strings"
 
-	"github.com/owncloud/ocis/web/pkg/config"
+	"github.com/owncloud/ocis/extensions/web/pkg/config"
 )
 
 func FullDefaultConfig() *config.Config {
diff --git a/web/pkg/config/http.go b/extensions/web/pkg/config/http.go
similarity index 100%
rename from web/pkg/config/http.go
rename to extensions/web/pkg/config/http.go
diff --git a/web/pkg/config/log.go b/extensions/web/pkg/config/log.go
similarity index 100%
rename from web/pkg/config/log.go
rename to extensions/web/pkg/config/log.go
diff --git a/web/pkg/config/parser/parse.go b/extensions/web/pkg/config/parser/parse.go
similarity index 85%
rename from web/pkg/config/parser/parse.go
rename to extensions/web/pkg/config/parser/parse.go
index 2f8fe31d0..d85094357 100644
--- a/web/pkg/config/parser/parse.go
+++ b/extensions/web/pkg/config/parser/parse.go
@@ -3,9 +3,9 @@ package parser
 import (
 	"errors"
 
+	"github.com/owncloud/ocis/extensions/web/pkg/config"
+	"github.com/owncloud/ocis/extensions/web/pkg/config/defaults"
 	ociscfg "github.com/owncloud/ocis/ocis-pkg/config"
-	"github.com/owncloud/ocis/web/pkg/config"
-	"github.com/owncloud/ocis/web/pkg/config/defaults"
 
 	"github.com/owncloud/ocis/ocis-pkg/config/envdecode"
 )
diff --git a/web/pkg/config/service.go b/extensions/web/pkg/config/service.go
similarity index 100%
rename from web/pkg/config/service.go
rename to extensions/web/pkg/config/service.go
diff --git a/web/pkg/config/tracing.go b/extensions/web/pkg/config/tracing.go
similarity index 100%
rename from web/pkg/config/tracing.go
rename to extensions/web/pkg/config/tracing.go
diff --git a/web/pkg/logging/logging.go b/extensions/web/pkg/logging/logging.go
similarity index 86%
rename from web/pkg/logging/logging.go
rename to extensions/web/pkg/logging/logging.go
index 57616a43b..ed81b87a1 100644
--- a/web/pkg/logging/logging.go
+++ b/extensions/web/pkg/logging/logging.go
@@ -1,8 +1,8 @@
 package logging
 
 import (
+	"github.com/owncloud/ocis/extensions/web/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/web/pkg/config"
 )
 
 // LoggerFromConfig initializes a service-specific logger instance.
diff --git a/web/pkg/metrics/metrics.go b/extensions/web/pkg/metrics/metrics.go
similarity index 100%
rename from web/pkg/metrics/metrics.go
rename to extensions/web/pkg/metrics/metrics.go
diff --git a/web/pkg/middleware/silentrefresh.go b/extensions/web/pkg/middleware/silentrefresh.go
similarity index 100%
rename from web/pkg/middleware/silentrefresh.go
rename to extensions/web/pkg/middleware/silentrefresh.go
diff --git a/web/pkg/server/debug/option.go b/extensions/web/pkg/server/debug/option.go
similarity index 94%
rename from web/pkg/server/debug/option.go
rename to extensions/web/pkg/server/debug/option.go
index e16759e76..f875a2109 100644
--- a/web/pkg/server/debug/option.go
+++ b/extensions/web/pkg/server/debug/option.go
@@ -3,8 +3,8 @@ package debug
 import (
 	"context"
 
+	"github.com/owncloud/ocis/extensions/web/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/web/pkg/config"
 )
 
 // Option defines a single option function.
diff --git a/web/pkg/server/debug/server.go b/extensions/web/pkg/server/debug/server.go
similarity index 96%
rename from web/pkg/server/debug/server.go
rename to extensions/web/pkg/server/debug/server.go
index d4d7e302e..0557fc70b 100644
--- a/web/pkg/server/debug/server.go
+++ b/extensions/web/pkg/server/debug/server.go
@@ -4,9 +4,9 @@ import (
 	"io"
 	"net/http"
 
+	"github.com/owncloud/ocis/extensions/web/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/service/debug"
 	"github.com/owncloud/ocis/ocis-pkg/version"
-	"github.com/owncloud/ocis/web/pkg/config"
 )
 
 // Server initializes the debug service and server.
diff --git a/web/pkg/server/http/option.go b/extensions/web/pkg/server/http/option.go
similarity index 93%
rename from web/pkg/server/http/option.go
rename to extensions/web/pkg/server/http/option.go
index 5d77b6cea..ee00b4c1d 100644
--- a/web/pkg/server/http/option.go
+++ b/extensions/web/pkg/server/http/option.go
@@ -3,9 +3,9 @@ package http
 import (
 	"context"
 
+	"github.com/owncloud/ocis/extensions/web/pkg/config"
+	"github.com/owncloud/ocis/extensions/web/pkg/metrics"
 	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/web/pkg/config"
-	"github.com/owncloud/ocis/web/pkg/metrics"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/web/pkg/server/http/server.go b/extensions/web/pkg/server/http/server.go
similarity index 90%
rename from web/pkg/server/http/server.go
rename to extensions/web/pkg/server/http/server.go
index b33019e83..9ee620cc1 100644
--- a/web/pkg/server/http/server.go
+++ b/extensions/web/pkg/server/http/server.go
@@ -2,11 +2,11 @@ package http
 
 import (
 	chimiddleware "github.com/go-chi/chi/v5/middleware"
+	webmid "github.com/owncloud/ocis/extensions/web/pkg/middleware"
+	svc "github.com/owncloud/ocis/extensions/web/pkg/service/v0"
 	"github.com/owncloud/ocis/ocis-pkg/middleware"
 	"github.com/owncloud/ocis/ocis-pkg/service/http"
 	"github.com/owncloud/ocis/ocis-pkg/version"
-	webmid "github.com/owncloud/ocis/web/pkg/middleware"
-	svc "github.com/owncloud/ocis/web/pkg/service/v0"
 	"go-micro.dev/v4"
 )
 
diff --git a/web/pkg/service/v0/instrument.go b/extensions/web/pkg/service/v0/instrument.go
similarity index 91%
rename from web/pkg/service/v0/instrument.go
rename to extensions/web/pkg/service/v0/instrument.go
index 45934e03a..49cef7036 100644
--- a/web/pkg/service/v0/instrument.go
+++ b/extensions/web/pkg/service/v0/instrument.go
@@ -3,7 +3,7 @@ package svc
 import (
 	"net/http"
 
-	"github.com/owncloud/ocis/web/pkg/metrics"
+	"github.com/owncloud/ocis/extensions/web/pkg/metrics"
 )
 
 // NewInstrument returns a service that instruments metrics.
diff --git a/web/pkg/service/v0/logging.go b/extensions/web/pkg/service/v0/logging.go
similarity index 100%
rename from web/pkg/service/v0/logging.go
rename to extensions/web/pkg/service/v0/logging.go
diff --git a/web/pkg/service/v0/option.go b/extensions/web/pkg/service/v0/option.go
similarity index 94%
rename from web/pkg/service/v0/option.go
rename to extensions/web/pkg/service/v0/option.go
index 534ed9bd5..bd55a2b1a 100644
--- a/web/pkg/service/v0/option.go
+++ b/extensions/web/pkg/service/v0/option.go
@@ -3,8 +3,8 @@ package svc
 import (
 	"net/http"
 
+	"github.com/owncloud/ocis/extensions/web/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/web/pkg/config"
 )
 
 // Option defines a single option function.
diff --git a/web/pkg/service/v0/service.go b/extensions/web/pkg/service/v0/service.go
similarity index 97%
rename from web/pkg/service/v0/service.go
rename to extensions/web/pkg/service/v0/service.go
index d7a92c3ad..3f762fded 100644
--- a/web/pkg/service/v0/service.go
+++ b/extensions/web/pkg/service/v0/service.go
@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/go-chi/chi/v5"
+	"github.com/owncloud/ocis/extensions/web/pkg/assets"
+	"github.com/owncloud/ocis/extensions/web/pkg/config"
 	"github.com/owncloud/ocis/ocis-pkg/log"
-	"github.com/owncloud/ocis/web/pkg/assets"
-	"github.com/owncloud/ocis/web/pkg/config"
 )
 
 var (
diff --git a/web/pkg/service/v0/tracing.go b/extensions/web/pkg/service/v0/tracing.go
similarity index 100%
rename from web/pkg/service/v0/tracing.go
rename to extensions/web/pkg/service/v0/tracing.go
diff --git a/web/pkg/tracing/tracing.go b/extensions/web/pkg/tracing/tracing.go
similarity index 90%
rename from web/pkg/tracing/tracing.go
rename to extensions/web/pkg/tracing/tracing.go
index cebc588bd..f6e977d24 100644
--- a/web/pkg/tracing/tracing.go
+++ b/extensions/web/pkg/tracing/tracing.go
@@ -1,8 +1,8 @@
 package tracing
 
 import (
+	"github.com/owncloud/ocis/extensions/web/pkg/config"
 	pkgtrace "github.com/owncloud/ocis/ocis-pkg/tracing"
-	"github.com/owncloud/ocis/web/pkg/config"
 	"go.opentelemetry.io/otel/trace"
 )
 
diff --git a/web/reflex.conf b/extensions/web/reflex.conf
similarity index 100%
rename from web/reflex.conf
rename to extensions/web/reflex.conf
diff --git a/web/web.go b/extensions/web/web.go
similarity index 100%
rename from web/web.go
rename to extensions/web/web.go
diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go
index 33b7732c3..4e4dd35ee 100644
--- a/ocis-pkg/config/config.go
+++ b/ocis-pkg/config/config.go
@@ -17,8 +17,8 @@ import (
 	settings "github.com/owncloud/ocis/extensions/settings/pkg/config"
 	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"
 	thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config"
-	web "github.com/owncloud/ocis/web/pkg/config"
 	webdav "github.com/owncloud/ocis/webdav/pkg/config"
 )
 
diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go
index 431286548..2325d4384 100644
--- a/ocis-pkg/config/defaultconfig.go
+++ b/ocis-pkg/config/defaultconfig.go
@@ -15,8 +15,8 @@ import (
 	settings "github.com/owncloud/ocis/extensions/settings/pkg/config/defaults"
 	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"
 	thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config/defaults"
-	web "github.com/owncloud/ocis/web/pkg/config/defaults"
 	webdav "github.com/owncloud/ocis/webdav/pkg/config/defaults"
 )
 
diff --git a/ocis/pkg/command/web.go b/ocis/pkg/command/web.go
index d5b2a9133..0b3ec822e 100644
--- a/ocis/pkg/command/web.go
+++ b/ocis/pkg/command/web.go
@@ -1,10 +1,10 @@
 package command
 
 import (
+	"github.com/owncloud/ocis/extensions/web/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/web/pkg/command"
 	"github.com/urfave/cli/v2"
 )
 
diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go
index 06b38eb81..e858af283 100644
--- a/ocis/pkg/runtime/service/service.go
+++ b/ocis/pkg/runtime/service/service.go
@@ -32,11 +32,11 @@ import (
 	settings "github.com/owncloud/ocis/extensions/settings/pkg/command"
 	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"
 	"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"
-	web "github.com/owncloud/ocis/web/pkg/command"
 	webdav "github.com/owncloud/ocis/webdav/pkg/command"
 	"github.com/rs/zerolog"
 	"github.com/thejerf/suture/v4"